openstack/rally
Code Issues Proposed changes

Fix cli tests vs MOS clouds

Browse Source 
MOS clouds have "TestVM" image and "novanetwork" network by default.

Change-Id: Ia382734af7b613608a901c21a85136c9e491589f
This commit is contained in:
Sergey Skripnick 2014-12-17 17:27:36 +02:00
parent f551a9b99d
commit 7caafc4cde
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/functional/test_cli_show.py
View File

@ -27,7 +27,9 @@ class ShowTestCase(unittest.TestCase):
def test_show_images(self):
res = self.rally("show images")
self.assertIn("cirros", res)
cirros = "cirros" in res
testvm = "TestVM" in res
self.assertTrue(cirros or testvm)
def test_show_flavors(self):
res = self.rally("show flavors")
@ -35,7 +37,9 @@ class ShowTestCase(unittest.TestCase):
def test_show_networks(self):
res = self.rally("show networks")
self.assertIn("private", res)
private = "private" in res
novanetwork = "novanetwork" in res
self.assertTrue(private or novanetwork)
def test_show_secgroups(self):
res = self.rally("show secgroups")