Refreshed patches.

Rewritten-From: 471fd967607ac437418013d22f355be4385b4cfd

diff --git a/xenial/debian/patches/disable-failed-django-1.7-test.patch b/xenial/debian/patches/disable-failed-django-1.7-test.patch
index ab8c42be97fc9260ff60fa9c7c14768a67ff1941..57fd8bdaa9b984e5116daf91c57266aa6c02aa89 100644 (file)
--- a/xenial/debian/patches/disable-failed-django-1.7-test.patch
+++ b/xenial/debian/patches/disable-failed-django-1.7-test.patch
@@ -8,9 +8,9 @@ Last-Update: 2014-09-21
 
 Index: horizon/openstack_dashboard/dashboards/identity/projects/tests.py
 ===================================================================
---- horizon.orig/openstack_dashboard/dashboards/identity/projects/tests.py     2014-12-25 17:37:13.000000000 +0800
-+++ horizon/openstack_dashboard/dashboards/identity/projects/tests.py  2014-12-25 18:35:42.000000000 +0800
-@@ -1535,43 +1535,6 @@
+--- horizon.orig/openstack_dashboard/dashboards/identity/projects/tests.py     2015-02-10 16:15:18.000000000 +0100
++++ horizon/openstack_dashboard/dashboards/identity/projects/tests.py  2015-02-10 16:45:44.000000000 +0100
+@@ -1536,43 +1536,6 @@
          self.assertMessageCount(error=2, warning=0)
          self.assertRedirectsNoFollow(res, INDEX_URL)
  

diff --git a/xenial/debian/patches/fix-moscow-tz-check.patch b/xenial/debian/patches/fix-moscow-tz-check.patch
deleted file mode 100644 (file)
index 30b521c..0000000
--- a/xenial/debian/patches/fix-moscow-tz-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/xenial/debian/patches/series b/xenial/debian/patches/series
index 8cbc337717eb09338a72470791e6c0945b6cf5f7..15031e29d9b5a279ea2e24b0dc4304314effacc1 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -2,4 +2,3 @@ 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