From 98a97d161e4853934fc7084c2f898dfb27557fd9 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 10 Feb 2015 16:46:07 +0100 Subject: [PATCH] Refreshed patches. Rewritten-From: 471fd967607ac437418013d22f355be4385b4cfd --- .../disable-failed-django-1.7-test.patch | 6 +++--- .../debian/patches/fix-moscow-tz-check.patch | 19 ------------------- trusty/debian/patches/series | 1 - 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 trusty/debian/patches/fix-moscow-tz-check.patch diff --git a/trusty/debian/patches/disable-failed-django-1.7-test.patch b/trusty/debian/patches/disable-failed-django-1.7-test.patch index ab8c42b..57fd8bd 100644 --- a/trusty/debian/patches/disable-failed-django-1.7-test.patch +++ b/trusty/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/trusty/debian/patches/fix-moscow-tz-check.patch b/trusty/debian/patches/fix-moscow-tz-check.patch deleted file mode 100644 index 30b521c..0000000 --- a/trusty/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 -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 8cbc337..15031e2 100644 --- a/trusty/debian/patches/series +++ b/trusty/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 -- 2.45.2