Adds Moscow tz check fix.

Rewritten-From: 5315fa540d8e9dca85fb8f56add1bf5ce5b153e9

diff --git a/trusty/debian/patches/fix-moscow-tz-check.patch b/trusty/debian/patches/fix-moscow-tz-check.patch
new file mode 100644 (file)
index 0000000..30b521c
--- /dev/null
+++ b/trusty/debian/patches/fix-moscow-tz-check.patch
@@ -0,0 +1,19 @@
+Description: Fix Moscow tz check
+ It seems that the test fails because Moscow tz changed. This patch removes
+ the UTC +04 check.
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: http://bugs.debian.org/775636
+Forwarded: no
+Last-Update: 2014-01-21
+
+--- horizon-2015.1~b1.orig/openstack_dashboard/dashboards/settings/user/tests.py
++++ horizon-2015.1~b1/openstack_dashboard/dashboards/settings/user/tests.py
+@@ -27,7 +27,7 @@ class UserSettingsTest(test.TestCase):
+         res = self.client.get(INDEX_URL)
+ 
+         self.assertContains(res, "UTC +11:00: Australia (Melbourne) Time")
+-        self.assertContains(res, "UTC +04:00: Russia (Moscow) Time")
++        self.assertContains(res, "Russia (Moscow) Time")
+         self.assertContains(res, "UTC -03:00: Falkland Islands Time")
+         self.assertContains(res, "UTC -10:00: United States (Honolulu) Time")
+ 

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 15031e29d9b5a279ea2e24b0dc4304314effacc1..8cbc337717eb09338a72470791e6c0945b6cf5f7 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 disable-failed-django-1.7-test.patch
+fix-moscow-tz-check.patch