From 5a004b8e8e6ce69f3e4b3911332797d672a4b75c Mon Sep 17 00:00:00 2001 From: Tristan van Berkom Date: Tue, 22 Dec 2020 17:57:55 +0900 Subject: tests/frontend/push.py: Fix fallout from recent tests This test was broken from the following commits: 98c807002cf3beb2110695083450a42fe8feefd0 9a124386a0ba8995e7cfd92e2c7d8fb23854f7e4 As of these commits, a Cli() instance requires it's directory to not be created in advance, this was not caught in CI because we skip the tests in CI where the runners lack proper subsecond mtime precision. --- tests/frontend/push.py | 4 +--- 1 file changed, 1 insertion(+), 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() -- cgit v1.2.1