summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-03 12:51:33 +0000
committerGerrit Code Review <review@openstack.org>2018-10-03 12:51:33 +0000
commit95bb08c806fefcd762a75724f64fc55176a212bc (patch)
treec7ae0b0452a062c57fffac27ca5f4147e88dc1bc
parent70af2d68c089b1233a7bf5bb31863dbe29a1a582 (diff)
parent6ee51d2000ba8aee1c1f19e0cd000ff57858e78a (diff)
Merge "Add missing tests for 2.6 statuses"
-rw-r--r--glance/tests/unit/v2/test_images_resource.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
index 91c0db9..30379d4 100644
--- a/glance/tests/unit/v2/test_images_resource.py
+++ b/glance/tests/unit/v2/test_images_resource.py
@@ -1821,6 +1821,12 @@ class TestImagesController(base.IsolatedUnitTest):
1821 def test_location_add_not_permitted_status_killed(self): 1821 def test_location_add_not_permitted_status_killed(self):
1822 self._test_update_locations_status('killed', 'add') 1822 self._test_update_locations_status('killed', 'add')
1823 1823
1824 def test_location_add_not_permitted_status_importing(self):
1825 self._test_update_locations_status('importing', 'add')
1826
1827 def test_location_add_not_permitted_status_uploading(self):
1828 self._test_update_locations_status('uploading', 'add')
1829
1824 def test_location_remove_not_permitted_status_saving(self): 1830 def test_location_remove_not_permitted_status_saving(self):
1825 self._test_update_locations_status('saving', 'remove') 1831 self._test_update_locations_status('saving', 'remove')
1826 1832
@@ -1839,6 +1845,12 @@ class TestImagesController(base.IsolatedUnitTest):
1839 def test_location_remove_not_permitted_status_queued(self): 1845 def test_location_remove_not_permitted_status_queued(self):
1840 self._test_update_locations_status('queued', 'remove') 1846 self._test_update_locations_status('queued', 'remove')
1841 1847
1848 def test_location_remove_not_permitted_status_importing(self):
1849 self._test_update_locations_status('importing', 'remove')
1850
1851 def test_location_remove_not_permitted_status_uploading(self):
1852 self._test_update_locations_status('uploading', 'remove')
1853
1842 def test_location_replace_not_permitted_status_saving(self): 1854 def test_location_replace_not_permitted_status_saving(self):
1843 self._test_update_locations_status('saving', 'replace') 1855 self._test_update_locations_status('saving', 'replace')
1844 1856
@@ -1854,6 +1866,12 @@ class TestImagesController(base.IsolatedUnitTest):
1854 def test_location_replace_not_permitted_status_killed(self): 1866 def test_location_replace_not_permitted_status_killed(self):
1855 self._test_update_locations_status('killed', 'replace') 1867 self._test_update_locations_status('killed', 'replace')
1856 1868
1869 def test_location_replace_not_permitted_status_importing(self):
1870 self._test_update_locations_status('importing', 'replace')
1871
1872 def test_location_replace_not_permitted_status_uploading(self):
1873 self._test_update_locations_status('uploading', 'replace')
1874
1857 def test_update_add_locations_insertion(self): 1875 def test_update_add_locations_insertion(self):
1858 self.config(show_multiple_locations=True) 1876 self.config(show_multiple_locations=True)
1859 new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}} 1877 new_location = {'url': '%s/fake_location' % BASE_URI, 'metadata': {}}