From cdf733741c48e4864346c1454c9c37910aace328 Mon Sep 17 00:00:00 2001 From: zhurong Date: Sun, 17 Nov 2019 23:38:54 -0800 Subject: [PATCH] Change Ussuri python jobs template Change-Id: I9b6232551b6c6639d1c0e0c1261662804bbcdbf8 --- .zuul.yaml | 2 +- muranodashboard/images/views.py | 2 +- muranodashboard/tests/unit/images/test_views.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index b7760b7cc..76cfb8554 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,7 +6,7 @@ - openstack-cover-jobs-horizon - openstack-lower-constraints-jobs - openstack-python-jobs-horizon - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs-horizon - release-notes-jobs-python3 check: jobs: diff --git a/muranodashboard/images/views.py b/muranodashboard/images/views.py index c38686c2c..6c39ebf5c 100644 --- a/muranodashboard/images/views.py +++ b/muranodashboard/images/views.py @@ -62,7 +62,7 @@ class MarkedImagesView(horizon_tables.DataTableView): self._prev = False self._more = False - glance_v2_client = glance.glanceclient(self.request, "2") + glance_v2_client = glance.glanceclient(self.request) try: images_iter = glance_v2_client.images.list( diff --git a/muranodashboard/tests/unit/images/test_views.py b/muranodashboard/tests/unit/images/test_views.py index 1cc040788..a621fa960 100644 --- a/muranodashboard/tests/unit/images/test_views.py +++ b/muranodashboard/tests/unit/images/test_views.py @@ -88,7 +88,7 @@ class TestMarkedImagesView(unittest.TestCase): self.images_view.request.GET.get.assert_called_once_with( tables.MarkedImagesTable._meta.prev_pagination_param, None) mock_glance.glanceclient.assert_called_once_with( - self.images_view.request, "2") + self.images_view.request) @mock.patch.object(views, 'glance', autospec=True) def test_get_data_with_desc_sort_dir(self, mock_glance): @@ -121,7 +121,7 @@ class TestMarkedImagesView(unittest.TestCase): mock.call(tables.MarkedImagesTable._meta.pagination_param, None) ]) mock_glance.glanceclient.assert_called_once_with( - self.images_view.request, "2") + self.images_view.request) @mock.patch.object(views, 'glance', autospec=True) def test_get_data_with_more_results(self, mock_glance): @@ -157,7 +157,7 @@ class TestMarkedImagesView(unittest.TestCase): self.images_view.request.GET.get.assert_called_once_with( tables.MarkedImagesTable._meta.prev_pagination_param, None) mock_glance.glanceclient.assert_called_once_with( - self.images_view.request, "2") + self.images_view.request) @mock.patch.object(views, 'reverse', autospec=True) @mock.patch.object(views, 'glance', autospec=True) @@ -176,6 +176,6 @@ class TestMarkedImagesView(unittest.TestCase): self.assertEqual('foo_reverse_url', e.location) mock_glance.glanceclient.assert_called_once_with( - self.images_view.request, "2") + self.images_view.request) mock_reverse.assert_called_once_with( 'horizon:app-catalog:catalog:index')