Fix failed tests.

Rewritten-From: 6fd9f8641bb30b93a48517b62ab08d2d72872178

diff --git a/trusty/debian/patches/0001-Fix-patch.patch b/trusty/debian/patches/0001-Fix-patch.patch
deleted file mode 100644 (file)
index 55ed0d7..0000000
--- a/trusty/debian/patches/0001-Fix-patch.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 27844673e0a736782cfc18505ba7ab0a2c0ccb63 Mon Sep 17 00:00:00 2001
-From: Ivan Udovichenko <iudovichenko@mirantis.com>
-Date: Tue, 21 Jun 2016 13:38:57 +0300
-Subject: [PATCH] Fix patch.
-
----
- openstack_dashboard/dashboards/project/volumes/volumes/tests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/tests.py b/openstack_dashboard/dashboards/project/volumes/volumes/tests.py
-index a77f8cd..e941ffe 100644
---- a/openstack_dashboard/dashboards/project/volumes/volumes/tests.py
-+++ b/openstack_dashboard/dashboards/project/volumes/volumes/tests.py
-@@ -16,10 +16,12 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import django
- from django.core.urlresolvers import reverse
- from django.forms import widgets
- from django import http
- from django.test.utils import override_settings
-+from django.utils.http import urlunquote  # noqa
- 
- from mox3.mox import IsA  # noqa
- import six
-@@ -32,7 +34,8 @@ from openstack_dashboard.usage import quotas
- 
- 
- VOLUME_INDEX_URL = reverse('horizon:project:volumes:index')
--VOLUME_VOLUMES_TAB_URL = reverse('horizon:project:volumes:volumes_tab')
-+VOLUME_VOLUMES_TAB_URL = urlunquote(reverse(
-+    'horizon:project:volumes:volumes_tab'))
- SEARCH_OPTS = dict(status=api.cinder.VOLUME_STATE_AVAILABLE)
- 
- 
--- 
-2.1.4
-

diff --git a/trusty/debian/patches/Fix_remaining_Django_1.9_test_failures.patch b/trusty/debian/patches/Fix_remaining_Django_1.9_test_failures.patch
index f266fd00dc119b505e868110f5ad5776d012d059..ca89da40f452e3beaad4df38d2c00972982a7738 100644 (file)
--- a/trusty/debian/patches/Fix_remaining_Django_1.9_test_failures.patch
+++ b/trusty/debian/patches/Fix_remaining_Django_1.9_test_failures.patch
@@ -696,3 +696,234 @@ index 8bf9990..d6f8ad7 100644
 +            exec(code)
 +    else:
 +        execfile(filename)
+
+--- a/openstack_dashboard/dashboards/project/volumes/volumes/tests.py  2016-06-27 22:12:41.173162395 +0000
++++ b/openstack_dashboard/dashboards/project/volumes/volumes/tests.py  2016-06-25 00:15:03.671055268 +0000
+@@ -16,10 +16,13 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
++import django
+ from django.core.urlresolvers import reverse
+ from django.forms import widgets
+ from django import http
++from django.template.defaultfilters import slugify  # noqa
+ from django.test.utils import override_settings
++from django.utils.http import urlunquote
+ 
+ from mox3.mox import IsA  # noqa
+ import six
+@@ -32,7 +35,8 @@
+ 
+ 
+ VOLUME_INDEX_URL = reverse('horizon:project:volumes:index')
+-VOLUME_VOLUMES_TAB_URL = reverse('horizon:project:volumes:volumes_tab')
++VOLUME_VOLUMES_TAB_URL = urlunquote(reverse(
++    'horizon:project:volumes:volumes_tab'))
+ SEARCH_OPTS = dict(status=api.cinder.VOLUME_STATE_AVAILABLE)
+ 
+ 
+@@ -472,8 +476,9 @@
+ 
+         cinder.volume_type_list(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.list())
+-        cinder.volume_type_list(IsA(http.HttpRequest)).\
+-            AndReturn(self.cinder_volume_types.list())
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_list(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.list())
+         cinder.volume_type_default(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.first())
+         quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+@@ -482,9 +487,13 @@
+                                    str(snapshot.id)).AndReturn(snapshot)
+         cinder.volume_get(IsA(http.HttpRequest), snapshot.volume_id).\
+             AndReturn(self.cinder_volumes.first())
+-
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_default(IsA(http.HttpRequest)). \
++                AndReturn(self.cinder_volume_types.first())
++            cinder.volume_snapshot_get(IsA(http.HttpRequest),
++                                       str(snapshot.id)).AndReturn(snapshot)
++            cinder.volume_get(IsA(http.HttpRequest), snapshot.volume_id). \
++                AndReturn(self.cinder_volumes.first())
+ 
+         self.mox.ReplayAll()
+ 
+@@ -649,8 +658,9 @@
+ 
+         cinder.volume_type_list(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.list())
+-        cinder.volume_type_list(IsA(http.HttpRequest)).\
+-            AndReturn(self.cinder_volume_types.list())
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_list(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.list())
+         cinder.volume_type_default(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.first())
+         quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+@@ -661,8 +671,15 @@
+             .AndReturn(True)
+         cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
+             self.cinder_availability_zones.list())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_default(IsA(http.HttpRequest)). \
++                AndReturn(self.cinder_volume_types.first())
++            api.glance.image_get(IsA(http.HttpRequest),
++                                 str(image.id)).AndReturn(image)
++            cinder.extension_supported(IsA(http.HttpRequest),
++                                       'AvailabilityZones').AndReturn(True)
++            cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
++                self.cinder_availability_zones.list())
+ 
+         self.mox.ReplayAll()
+ 
+@@ -696,8 +713,9 @@
+ 
+         cinder.volume_type_list(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.list())
+-        cinder.volume_type_list(IsA(http.HttpRequest)).\
+-            AndReturn(self.cinder_volume_types.list())
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_list(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.list())
+         cinder.volume_type_default(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.first())
+         quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+@@ -708,8 +726,15 @@
+             .AndReturn(True)
+         cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
+             self.cinder_availability_zones.list())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_default(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.first())
++            api.glance.image_get(IsA(http.HttpRequest),
++                                 str(image.id)).AndReturn(image)
++            cinder.extension_supported(IsA(http.HttpRequest),
++                                       'AvailabilityZones').AndReturn(True)
++            cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
++                self.cinder_availability_zones.list())
+ 
+         self.mox.ReplayAll()
+ 
+@@ -753,8 +778,9 @@
+ 
+         cinder.volume_type_list(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.list())
+-        cinder.volume_type_list(IsA(http.HttpRequest)).\
+-            AndReturn(self.cinder_volume_types.list())
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_list(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.list())
+         cinder.volume_type_default(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.first())
+         quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+@@ -778,8 +804,29 @@
+             .AndReturn(True)
+         cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
+             self.cinder_availability_zones.list())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_default(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.first())
++            cinder.volume_snapshot_list(IsA(http.HttpRequest),
++                                        search_opts=SEARCH_OPTS). \
++                AndReturn(self.cinder_volume_snapshots.list())
++            api.glance.image_list_detailed(
++                IsA(http.HttpRequest),
++                filters={'is_public': True, 'status': 'active'}) \
++                .AndReturn([self.images.list(), False, False])
++            api.glance.image_list_detailed(
++                IsA(http.HttpRequest),
++                filters={'property-owner_id': self.tenant.id,
++                         'status': 'active'}) \
++                .AndReturn([[], False, False])
++            cinder.volume_list(IsA(
++                http.HttpRequest),
++                search_opts=SEARCH_OPTS).AndReturn(self.cinder_volumes.list())
++            cinder.extension_supported(IsA(http.HttpRequest),
++                                       'AvailabilityZones') \
++                .AndReturn(True)
++            cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
++                self.cinder_availability_zones.list())
+ 
+         self.mox.ReplayAll()
+ 
+@@ -810,8 +857,9 @@
+ 
+         cinder.volume_type_list(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.list())
+-        cinder.volume_type_list(IsA(http.HttpRequest)).\
+-            AndReturn(self.cinder_volume_types.list())
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_list(IsA(http.HttpRequest)).\
++                AndReturn(self.cinder_volume_types.list())
+         cinder.volume_type_default(IsA(http.HttpRequest)).\
+             AndReturn(self.cinder_volume_types.first())
+         quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+@@ -835,8 +883,29 @@
+             .AndReturn(True)
+         cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
+             self.cinder_availability_zones.list())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
++        if django.VERSION >= (1, 9):
++            cinder.volume_type_default(IsA(http.HttpRequest)). \
++                AndReturn(self.cinder_volume_types.first())
++            cinder.volume_snapshot_list(IsA(http.HttpRequest),
++                                        search_opts=SEARCH_OPTS). \
++                AndReturn(self.cinder_volume_snapshots.list())
++            api.glance.image_list_detailed(
++                IsA(http.HttpRequest),
++                filters={'is_public': True, 'status': 'active'}) \
++                .AndReturn([self.images.list(), False, False])
++            api.glance.image_list_detailed(
++                IsA(http.HttpRequest),
++                filters={'property-owner_id': self.tenant.id,
++                         'status': 'active'}) \
++                .AndReturn([[], False, False])
++            cinder.volume_list(IsA(
++                http.HttpRequest),
++                search_opts=SEARCH_OPTS).AndReturn(self.cinder_volumes.list())
++            cinder.extension_supported(IsA(http.HttpRequest),
++                                       'AvailabilityZones') \
++                .AndReturn(True)
++            cinder.availability_zone_list(IsA(http.HttpRequest)).AndReturn(
++                self.cinder_availability_zones.list())
+ 
+         self.mox.ReplayAll()
+ 
+@@ -1434,18 +1503,12 @@
+                         quotas: ('tenant_limit_usages',)})
+     def test_extend_volume_with_wrong_size(self):
+         volume = self.cinder_volumes.first()
+-        usage_limit = {'maxTotalVolumeGigabytes': 100,
+-                       'gigabytesUsed': 20,
+-                       'volumesUsed': len(self.cinder_volumes.list()),
+-                       'maxTotalVolumes': 6}
+         formData = {'name': u'A Volume I Am Making',
+                     'orig_size': volume.size,
+                     'new_size': 10}
+ 
+         cinder.volume_get(IsA(http.HttpRequest), volume.id).\
+             AndReturn(self.cinder_volumes.first())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
+ 
+         self.mox.ReplayAll()
+ 
+@@ -1574,8 +1637,6 @@
+             AndReturn(usage_limit)
+         cinder.volume_get(IsA(http.HttpRequest), volume.id).\
+             AndReturn(self.volumes.first())
+-        quotas.tenant_limit_usages(IsA(http.HttpRequest)).\
+-            AndReturn(usage_limit)
+ 
+         self.mox.ReplayAll()

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index c106d82e1983c2c1a684977f375b900f6d252b10..41ab217c395057629851cedb0f3b80b76d8082a2 100644 (file)
--- 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
 Fix_remaining_Django_1.9_test_failures.patch
-0001-Fix-patch.patch