diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-12-22 11:17:12 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-12-22 11:17:12 +0000 |
| commit | 6904c1328cec54b3858e57bbd83ee59e0fd7e16e (patch) | |
| tree | 7e53e67d533ee1bc7c768a29a0616af1389923ca | |
| parent | 096c7292247c0aee4483b42f1d8da67c124dbcac (diff) | |
| parent | 5a004b8e8e6ce69f3e4b3911332797d672a4b75c (diff) | |
| download | buildstream-6904c1328cec54b3858e57bbd83ee59e0fd7e16e.tar.gz | |
Merge branch 'tristan/fix-broken-test' into 'master'
tests/frontend/push.py: Fix test fallout from recent changes
See merge request BuildStream/buildstream!2120
| -rw-r--r-- | tests/frontend/push.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/frontend/push.py b/tests/frontend/push.py index 0b1d988f9..4e39c2271 100644 --- a/tests/frontend/push.py +++ b/tests/frontend/push.py @@ -28,8 +28,7 @@ import shutil import pytest from buildstream.exceptions import ErrorDomain -from buildstream.testing import cli, generate_project # pylint: disable=unused-import -from buildstream.testing.runcli import Cli +from buildstream.testing import cli, generate_project, Cli # pylint: disable=unused-import from buildstream.testing._utils.site import have_subsecond_mtime from tests.testutils import ( create_artifact_share, @@ -533,7 +532,6 @@ def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir): # Pull the element1 from the remote cache (this should update its mtime). # Use a separate local cache for this to ensure the complete element is pulled. cli2_path = os.path.join(str(tmpdir), "cli2") - os.mkdir(cli2_path) cli2 = Cli(cli2_path) result = cli2.run(project=project, args=["artifact", "pull", "element1.bst", "--remote", share.repo]) result.assert_success() |