Move test/test_show.py fixture to conftest.py (#1122)

airspeed-velocity · Mar 10, 2022 · 8f5c6af · 8f5c6af
1 parent 35718fb
commit 8f5c6af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -290,3 +290,17 @@ def benchmarks_fixture(tmpdir):
  commit_hash = repo.get_hash_from_name(repo.get_branch_name())
 
  return conf, repo, envs, commit_hash
+
+
+@pytest.fixture
+def show_fixture(tmpdir, example_results):
+ tmpdir = str(tmpdir)
+ os.chdir(tmpdir)
+
+ conf = config.Config.from_json(
+ {'results_dir': example_results,
+ 'repo': tools.generate_test_repo(tmpdir).path,
+ 'project': 'asv',
+ 'environment_type': "shouldn't matter what"})
+
+ return conf
diff --git a/test/test_show.py b/test/test_show.py
@@ -3,28 +3,13 @@
 import textwrap
 from os.path import abspath, dirname, join
 
-import pytest
-
 from asv import config
 
 from . import tools
 
 BENCHMARK_DIR = abspath(join(dirname(__file__), 'example_results'))
 MACHINE_FILE = abspath(join(dirname(__file__), 'asv-machine.json'))
 
-@pytest.fixture
-def show_fixture(tmpdir, example_results):
- tmpdir = str(tmpdir)
- os.chdir(tmpdir)
-
- conf = config.Config.from_json(
- {'results_dir': example_results,
- 'repo': tools.generate_test_repo(tmpdir).path,
- 'project': 'asv',
- 'environment_type': "shouldn't matter what"})
-
- return conf
-
 
 def test_show(capsys, show_fixture):
  conf = show_fixture