Removed debian/patches/disable-failed-django-1.7-test.patch

Rewritten-From: 2cbec377957b56e2524b8f7ac3bcd90e3d395d49

diff --git a/trusty/debian/patches/disable-failed-django-1.7-test.patch b/trusty/debian/patches/disable-failed-django-1.7-test.patch
deleted file mode 100644 (file)
index 57fd8bd..0000000
--- a/trusty/debian/patches/disable-failed-django-1.7-test.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Disable test_update_project_when_default_role_does_not_exist()
- This last test is the last remaining one that fails with Django 1.7. It
- doesn't seem like it is a relevant failure, and that running Django 1.7 only
- reveal the issue instead of creating it.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-09-21
-
-Index: horizon/openstack_dashboard/dashboards/identity/projects/tests.py
-===================================================================
---- 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)
- 
--    @test.create_stubs({api.keystone: ('get_default_role',
--                                       'tenant_get',
--                                       'domain_get'),
--                        quotas: ('get_tenant_quota_data',
--                                 'get_disabled_quotas')})
--    def test_update_project_when_default_role_does_not_exist(self):
--        project = self.tenants.first()
--        domain_id = project.domain_id
--        quota = self.quotas.first()
--
--        api.keystone.get_default_role(IsA(http.HttpRequest)) \
--            .MultipleTimes().AndReturn(None)  # Default role doesn't exist
--        api.keystone.tenant_get(IsA(http.HttpRequest), self.tenant.id,
--                                admin=True) \
--            .AndReturn(project)
--        api.keystone.domain_get(IsA(http.HttpRequest), domain_id) \
--            .AndReturn(self.domain)
--        quotas.get_disabled_quotas(IsA(http.HttpRequest)) \
--            .AndReturn(self.disabled_quotas.first())
--        quotas.get_tenant_quota_data(IsA(http.HttpRequest),
--                                     tenant_id=self.tenant.id) \
--            .AndReturn(quota)
--        self.mox.ReplayAll()
--
--        url = reverse('horizon:identity:projects:update',
--                      args=[self.tenant.id])
--
--        try:
--            # Avoid the log message in the test output when the workflow's
--            # step action cannot be instantiated
--            logging.disable(logging.ERROR)
--            with self.assertRaises(exceptions.NotFound):
--                self.client.get(url)
--        finally:
--            logging.disable(logging.NOTSET)
--
--
- class UsageViewTests(test.BaseAdminViewTests):
-     def _stub_nova_api_calls(self, nova_stu_enabled=True):
-         self.mox.StubOutWithMock(api.nova, 'usage_get')

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