Added do-not-use-django.utils.unittest.patch.

Rewritten-From: 1f46fa1a08657c7f564807483194c49d36c96daf

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 262689854d45b7bd34eeb4e9df675311b8127f55..d2d62e8bc8cae8364304489e0ecf011667af150c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ horizon (2:8.0.0-4) unstable; urgency=medium
 
   * Added do-not-use-django.utils.log.NullHandler.patch
   * Added do-not-use-importlib-from-django.patch.
+  * Added do-not-use-django.utils.unittest.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
 

diff --git a/trusty/debian/patches/do-not-use-django.utils.unittest.patch b/trusty/debian/patches/do-not-use-django.utils.unittest.patch
new file mode 100644 (file)
index 0000000..ab8ee07
--- /dev/null
+++ b/trusty/debian/patches/do-not-use-django.utils.unittest.patch
@@ -0,0 +1,72 @@
+Description: Do not use django.utils.unittestdjango.utils.unittest
+ This is removed from Django 1.9
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/test/helpers.py
++++ horizon-8.0.0/horizon/test/helpers.py
+@@ -34,7 +34,7 @@ from django import test as django_test
+ from django.test.client import RequestFactory  # noqa
+ from django.test import testcases
+ from django.utils.encoding import force_text
+-from django.utils import unittest
++import unittest
+ 
+ if django.VERSION < (1, 7):
+     from django.test import LiveServerTestCase  # noqa
+--- horizon-8.0.0.orig/horizon/test/tests/test_file_discovery.py
++++ horizon-8.0.0/horizon/test/tests/test_file_discovery.py
+@@ -10,7 +10,7 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+ 
+-from django.utils import unittest
++import unittest
+ from horizon.utils import file_discovery as fd
+ 
+ base_path = 'some_root/fake_static_files/'
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/trove/content/databases/tests.py
++++ horizon-8.0.0/openstack_dashboard/contrib/trove/content/databases/tests.py
+@@ -18,7 +18,7 @@ import logging
+ import django
+ from django.core.urlresolvers import reverse
+ from django import http
+-from django.utils import unittest
++import unittest
+ 
+ from mox3.mox import IsA  # noqa
+ import six
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/identity/projects/tests.py
++++ horizon-8.0.0/openstack_dashboard/dashboards/identity/projects/tests.py
+@@ -22,7 +22,7 @@ from django.core.urlresolvers import rev
+ from django import http
+ from django.test.utils import override_settings
+ from django.utils import timezone
+-from django.utils import unittest
++import unittest
+ 
+ from mox3.mox import IgnoreArg  # noqa
+ from mox3.mox import IsA  # noqa
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/settings/password/tests.py
++++ horizon-8.0.0/openstack_dashboard/dashboards/settings/password/tests.py
+@@ -17,7 +17,7 @@ from django.conf import settings
+ from django.core.urlresolvers import reverse
+ from django import http
+ from django.utils.six.moves.urllib.parse import urlsplit  # noqa
+-from django.utils import unittest
++import unittest
+ 
+ from mox3.mox import IsA  # noqa
+ 
+--- horizon-8.0.0.orig/openstack_dashboard/test/helpers.py
++++ horizon-8.0.0/openstack_dashboard/test/helpers.py
+@@ -32,7 +32,7 @@ from django.core import urlresolvers
+ from django.test.client import RequestFactory  # noqa
+ from django.test import utils as django_test_utils
+ from importlib import import_module  # noqa
+-from django.utils import unittest
++import unittest
+ import glanceclient
+ from heatclient import client as heat_client
+ import httplib2

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 1f10cfe607520c45c90aad9a86dada99cf5132c0..fc1fc169353efcd9457e3f105f4366d7640dbd3c 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -3,3 +3,4 @@ fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 do-not-use-importlib-from-django.patch
 do-not-use-django.utils.log.NullHandler.patch
+do-not-use-django.utils.unittest.patch