tests/cachekey/cachekey.py: Use the cli runner fixture here.

1 files changed, 5 insertions, 15 deletions

diff --git a/tests/cachekey/cachekey.py b/tests/cachekey/cachekey.py
index d6f840dbc..8f350bf43 100644
--- a/tests/cachekey/cachekey.py
+++ b/tests/cachekey/cachekey.py
@@ -35,15 +35,12 @@
 # run over to the corresponding .expected source files and commit
 # the result.
 #
+from tests.testutils.runcli import cli
 
 import os
 from collections import OrderedDict
-from click.testing import CliRunner
 import pytest
 
-# Import the main cli entrypoint
-from buildstream._frontend.main import cli
-
 
 ##############################################
 #                Some Helpers                #
@@ -148,17 +145,10 @@ DATA_DIR = os.path.join(
 )
 
 
-@pytest.fixture(scope="module")
-def runner():
-    return CliRunner()
-
-
 @pytest.mark.datafiles(DATA_DIR)
-def test_cache_key(datafiles, runner):
-    project_dir = os.path.join(datafiles.dirname, datafiles.basename)
-    result = runner.invoke(cli, [
-        '--no-verbose',
-        '--directory', project_dir,
+def test_cache_key(datafiles, cli):
+    project = os.path.join(datafiles.dirname, datafiles.basename)
+    result = cli.run(project=project, silent=True, args=[
         'show',
         '--format', '%{name}::%{full-key}',
         'target.bst'
@@ -168,4 +158,4 @@ def test_cache_key(datafiles, runner):
         raise AssertionError("BuildStream exited with code {} and output:\n{}"
                              .format(result.exit_code, result.output))
 
-    assert_cache_keys(project_dir, result.output)
+    assert_cache_keys(project, result.output)