almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

tests: Finish switch to using example-development in composer tests

Browse Source 
These tests are fragile, order matters in some cases, and a previous
patch was incomplete. The diff test was failing because the blueprint
that it checks must be pushed twice in order to trigger the version bump
and 'Changed Version' output from composer-cli.

Related: rhbz#1785154
This commit is contained in:
Brian C. Lane 2020-02-05 14:38:28 -08:00
parent 2c9989a06d
commit c1af43d56f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/composer/test_blueprints.py
View File

@ -175,7 +175,7 @@ class BlueprintsTest(unittest.TestCase):
def test_save_0(self): def test_save_0(self):
"""blueprints save example-development""" """blueprints save example-development"""
blueprints_save("/run/weldr/api.socket", 0, ["example-development"], show_json=False) blueprints_save("/run/weldr/api.socket", 0, ["example-development"], show_json=False)
self.assertTrue(os.path.exists("example-http-server.toml")) self.assertTrue(os.path.exists("example-development.toml"))
@unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server") @unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server")
def test_save_1(self): def test_save_1(self):
@ -233,7 +233,7 @@ class BlueprintsTest(unittest.TestCase):
@unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server") @unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server")
def test_tag(self): def test_tag(self):
"""blueprints tag""" """blueprints tag"""
rc = blueprints_tag("/run/weldr/api.socket", 0, ["glusterfs"], show_json=False) rc = blueprints_tag("/run/weldr/api.socket", 0, ["example-development"], show_json=False)
self.assertTrue(rc == 0) self.assertTrue(rc == 0)
@unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server") @unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server")
@ -253,7 +253,7 @@ class BlueprintsTest(unittest.TestCase):
@unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server") @unittest.skipUnless(os.path.exists("/run/weldr/api.socket"), "Test requires a running API server")
def test_workspace(self): def test_workspace(self):
"""blueprints workspace""" """blueprints workspace"""
rc = blueprints_push("/run/weldr/api.socket", 0, ["example-http-server.toml"], show_json=False) rc = blueprints_push("/run/weldr/api.socket", 0, ["example-development.toml"], show_json=False)
self.assertTrue(rc == 0) self.assertTrue(rc == 0)
# XXX MUST COME LAST # XXX MUST COME LAST
@ -263,12 +263,12 @@ class BlueprintsTest(unittest.TestCase):
"""blueprints diff""" """blueprints diff"""
# Get the oldest commit, it should be 2nd to last line # Get the oldest commit, it should be 2nd to last line
with captured_output() as (out, _): with captured_output() as (out, _):
rc = blueprints_changes("/run/weldr/api.socket", 0, ["example-http-server"], show_json=False) rc = blueprints_changes("/run/weldr/api.socket", 0, ["example-development"], show_json=False)
output = out.getvalue().strip().splitlines() output = out.getvalue().strip().splitlines()
first_commit = output[-2].split()[1] first_commit = output[-2].split()[1]
with captured_output() as (out, _): with captured_output() as (out, _):
rc = blueprints_diff("/run/weldr/api.socket", 0, ["example-http-server", first_commit, "HEAD"], show_json=False) rc = blueprints_diff("/run/weldr/api.socket", 0, ["example-development", first_commit, "HEAD"], show_json=False)
output = out.getvalue().strip() output = out.getvalue().strip()
self.assertTrue(rc == 0) self.assertTrue(rc == 0)
self.assertTrue("Changed Version" in output) self.assertTrue("Changed Version" in output)