diff --git a/test/conftest.py b/test/conftest.py index be25b8f47..b86e3c27a 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -4,6 +4,8 @@ from os.path import join from asv import config from asv import repo +from .test_workflow import generate_basic_conf + try: import hglib @@ -109,3 +111,11 @@ def two_branch_repo_case(request, tmpdir): conf.project = join(tmpdir, "repo") r = repo.get_repo(conf) return dvcs, master, r, conf + + +@pytest.fixture +def existing_env_conf(tmpdir): + tmpdir, local, conf, machine_file = generate_basic_conf(tmpdir) + conf.environment_type = "existing" + conf.pythons = ["same"] + return tmpdir, local, conf, machine_file diff --git a/test/test_run.py b/test/test_run.py index 8f24e6320..eabb55cd0 100644 --- a/test/test_run.py +++ b/test/test_run.py @@ -31,14 +31,6 @@ def basic_conf_with_subdir(tmpdir, dummy_packages): return generate_basic_conf(tmpdir, 'some_subdir') -@pytest.fixture -def existing_env_conf(tmpdir): - tmpdir, local, conf, machine_file = generate_basic_conf(tmpdir) - conf.environment_type = "existing" - conf.pythons = ["same"] - return tmpdir, local, conf, machine_file - - def test_set_commit_hash(capsys, existing_env_conf): tmpdir, local, conf, machine_file = existing_env_conf