Skip to content

Commit

Permalink
Move the test data into tests directory (conda#10870)
Browse files Browse the repository at this point in the history
* Move test repodata into tests directory.

* Move env_metadata into test directory.
  • Loading branch information
jezdez authored Aug 19, 2021
1 parent 6035224 commit 9b8f639
Show file tree
Hide file tree
Showing 1,242 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion tests/common/pkg_formats/test_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
)
from conda.common.url import join_url
import pytest
from test_data.env_metadata import METADATA_VERSION_PATHS
from tests.data.env_metadata import METADATA_VERSION_PATHS


# Helpers
Expand Down
4 changes: 2 additions & 2 deletions tests/core/test_prefix_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

from conda.common.compat import on_win, odict
from conda.core.prefix_data import PrefixData, get_conda_anchor_files_and_records
from test_data.env_metadata import (
from tests.data.env_metadata import (
PATH_TEST_ENV_1, PATH_TEST_ENV_2, PATH_TEST_ENV_3, PATH_TEST_ENV_4,
)
from conda.base.constants import PREFIX_STATE_FILE
Expand Down Expand Up @@ -236,4 +236,4 @@ def test_set_unset_environment_env_vars_no_exist(self):
}
self.pd.unset_environment_env_vars(['WOAH'])
env_vars = self.pd.get_environment_env_vars()
assert env_vars_one == env_vars
assert env_vars_one == env_vars
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/data/build-index2-json.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from conda.core.subdir_data import fetch_repodata_remote_request

DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
DATA_DIR = abspath(join(dirname(__file__), "repodata"))

def save_data_source(url, name):
raw_repodata_str = fetch_repodata_remote_request(url, None, None)
Expand Down
2 changes: 1 addition & 1 deletion tests/data/build-index4-json.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from conda.common.compat import itervalues
from conda.core.subdir_data import fetch_repodata_remote_request

DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
DATA_DIR = abspath(join(dirname(__file__), "repodata"))

def save_data_source(url, name):
raw_repodata_str = fetch_repodata_remote_request(url, None, None)
Expand Down
2 changes: 1 addition & 1 deletion tests/data/build-index5-json.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from conda.core.subdir_data import fetch_repodata_remote_request

DATA_DIR = abspath(join(dirname(__file__), "..", "..", "test-data", "repodata"))
DATA_DIR = abspath(join(dirname(__file__), "repodata"))

def save_data_source(url, name):
raw_repodata_str = fetch_repodata_remote_request(url, None, None)
Expand Down
File renamed without changes.
Loading

0 comments on commit 9b8f639

Please sign in to comment.