openstack
/
murano-dashboard
Code Issues Proposed changes

Merge "Changes image creation/deletion in sanity_check to be atomic.."

This commit is contained in:
Jenkins 2017-01-30 13:49:06 +00:00 committed by Gerrit Code Review
parent fc4380f87d 3bf38434fe
commit c0623b6974
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
muranodashboard/tests/functional/base.py
View File

@ -437,13 +437,15 @@ class ImageTestCase(PackageBase):
glance_endpoint = cls.service_catalog.url_for(service_type='image')
cls.glance = gclient.Client('1', endpoint=glance_endpoint,
session=cls.keystone_client.session)
cls.image_title = 'New Image ' + str(time.time())
cls.image = cls.upload_image(cls.image_title)
@classmethod
def tearDownClass(cls):
super(ImageTestCase, cls).tearDownClass()
cls.glance.images.delete(cls.image.id)
def setUp(self):
super(ImageTestCase, self).setUp()
self.image_title = self.gen_random_resource_name('test-image', 15)
self.image = self.upload_image(self.image_title)
def tearDown(self):
super(ImageTestCase, self).tearDown()
self.glance.images.delete(self.image.id)
@classmethod
def upload_image(cls, title):
@ -464,16 +466,6 @@ class ImageTestCase(PackageBase):
self.driver.find_element_by_xpath(
".//*[@value = '{0}']".format(element)).click()
def repair_image(self):
self.driver.find_element_by_id(
'marked_images__action_mark_image').click()
self.select_from_list('image', self.image.id)
self.fill_field(by.By.ID, 'id_title', self.image_title)
self.select_from_list('type', 'linux')
self.select_and_click_element('Mark Image')
self.check_element_on_page(by.By.XPATH,
consts.TestImage.format(self.image_title))
class FieldsTestCase(PackageBase):
def check_error_message_is_present(self, error_message):

5
muranodashboard/tests/functional/sanity_check.py
View File

@ -791,8 +791,6 @@ class TestSuiteImage(base.ImageTestCase):
self.select_and_click_element('Mark Image')
self.check_element_on_page(by.By.XPATH, c.TestImage.format(new_title))
self.repair_image()
def test_check_image_info(self):
"""Test check ability to view image details
@ -823,7 +821,6 @@ class TestSuiteImage(base.ImageTestCase):
self.wait_for_alert_message()
self.check_element_not_on_page(by.By.XPATH,
c.TestImage.format(self.image_title))
self.repair_image()
def test_delete_multiple_images(self):
"""Test ability to delete multiple images.
@ -894,8 +891,6 @@ class TestSuiteImage(base.ImageTestCase):
self.check_element_not_on_page(
by.By.XPATH, c.TestImage.format(default_image_title))
self.repair_image() # Restore the class-level image that was deleted.
class TestSuiteFields(base.FieldsTestCase):
def test_check_domain_name_field_validation(self):