diff options
| author | James Ennis <james.ennis@codethink.co.uk> | 2019-08-15 12:36:39 +0100 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.co.uk> | 2019-08-19 12:14:04 +0100 |
| commit | c5adcd171c403b45f28b3cf8ab354af24620bc96 (patch) | |
| tree | 793642a6a3359f845e3d5e7a7a14555d99d052fb | |
| parent | dd03a017f2fea55e5e4311df332a16891b0ec0ff (diff) | |
| download | buildstream-c5adcd171c403b45f28b3cf8ab354af24620bc96.tar.gz | |
tests/frontend/buildcheckout.py: Stop using explicit cache keys
Only our tests/cachekey tests should test explicit cache keys.
Tests outside of here should determine cache keys using
the appropriate methods.
| -rw-r--r-- | tests/frontend/buildcheckout.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py index 50b2daf4f..b83fc2f3d 100644 --- a/tests/frontend/buildcheckout.py +++ b/tests/frontend/buildcheckout.py @@ -310,8 +310,8 @@ def test_build_checkout_using_ref(datafiles, cli): result = cli.run(project=project, args=['build', 'checkout-deps.bst']) result.assert_success() - checkout_args = ['artifact', 'checkout', '--directory', checkout, - 'test/checkout-deps/602d6859b2e4bdc2af7f3ff34113c4e49219291c0b5c3be8642f85e94322ce49'] + key = cli.get_element_key(project, 'checkout-deps.bst') + checkout_args = ['artifact', 'checkout', '--directory', checkout, 'test/checkout-deps/' + key] result = cli.run(project=project, args=checkout_args) result.assert_success() @@ -332,8 +332,8 @@ def test_build_checkout_tarball_using_ref(datafiles, cli): assert os.path.isdir(builddir) assert not os.listdir(builddir) - checkout_args = ['artifact', 'checkout', '--deps', 'none', '--tar', checkout, - 'test/checkout-deps/602d6859b2e4bdc2af7f3ff34113c4e49219291c0b5c3be8642f85e94322ce49'] + key = cli.get_element_key(project, 'checkout-deps.bst') + checkout_args = ['artifact', 'checkout', '--deps', 'none', '--tar', checkout, 'test/checkout-deps/' + key] result = cli.run(project=project, args=checkout_args) result.assert_success() @@ -355,7 +355,7 @@ def test_build_checkout_invalid_ref(datafiles, cli): assert not os.listdir(builddir) checkout_args = ['artifact', 'checkout', '--deps', 'none', '--tar', checkout, - 'test/checkout-deps/602d6859b2e4bdc2af7f3ff34113c4e49219291c0b5c3be8642f85e94322ce48'] + 'test/checkout-deps/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'] result = cli.run(project=project, args=checkout_args) assert "seems to be invalid. Note that an Element name can also be used." in result.stderr |