Browse Source

Merge "Change Ussuri python jobs template"

changes/47/694647/3
Zuul 2 weeks ago
parent
commit
91ae9e2621
3 changed files with 6 additions and 6 deletions
  1. +1
    -1
      .zuul.yaml
  2. +1
    -1
      muranodashboard/images/views.py
  3. +4
    -4
      muranodashboard/tests/unit/images/test_views.py

+ 1
- 1
.zuul.yaml View File

@@ -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:

+ 1
- 1
muranodashboard/images/views.py View File

@@ -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(

+ 4
- 4
muranodashboard/tests/unit/images/test_views.py View File

@@ -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')

Loading…
Cancel
Save