This commit is contained in:
skshetry
2025-12-01 15:52:37 +05:45
committed by GitHub
parent cf5168af74
commit cb96cf1487
42 changed files with 66 additions and 72 deletions
+1 -1
View File
@@ -91,7 +91,7 @@ def test_apply_untracked(tmp_dir, scm, dvc, exp_stage):
def test_apply_unchanged_head(tmp_dir, scm, dvc, exp_stage):
# see https://github.com/iterative/dvc/issues/8764
# see https://github.com/treeverse/dvc/issues/8764
tmp_dir.gen("params.yaml", "foo: 2")
scm.add(["dvc.yaml", "dvc.lock", "params.yaml", "metrics.yaml"])
scm.commit("commit foo=2")
+1 -1
View File
@@ -26,7 +26,7 @@ def test_celery_logs(tmp_dir, scm, dvc, failed_exp_stage, follow, capsys, test_q
def test_queue_doesnt_remove_untracked_params_file(tmp_dir, dvc, scm):
"""Regression test for https://github.com/iterative/dvc/issues/7842"""
"""Regression test for https://github.com/treeverse/dvc/issues/7842"""
tmp_dir.gen("params.yaml", "foo: 1")
stage = dvc.run(cmd="echo ${foo}", params=["foo"], name="echo-foo")
scm.add(["dvc.yaml", "dvc.lock", ".gitignore"])
+1 -1
View File
@@ -105,7 +105,7 @@ def test_exp_save_include_untracked(tmp_dir, dvc, scm):
def test_exp_save_include_untracked_warning(tmp_dir, dvc, scm, mocker):
"""Regression test for https://github.com/iterative/dvc/issues/9061"""
"""Regression test for https://github.com/treeverse/dvc/issues/9061"""
setup_stage(tmp_dir, dvc, scm)
new_dir = tmp_dir / "new_dir"
+1 -1
View File
@@ -148,7 +148,7 @@ def test_downstream(M, tmp_dir, dvc):
assert [stage.name for stage in evaluation] == ["B-gen", "D-gen", "E-gen"]
# B, C should be run (in any order) before D
# See https://github.com/iterative/dvc/issues/3602
# See https://github.com/treeverse/dvc/issues/3602
evaluation = dvc.reproduce(PROJECT_FILE + ":A-gen", downstream=True, force=True)
assert len(evaluation) == 5
+1 -1
View File
@@ -36,7 +36,7 @@ def test_repro_allow_missing_and_pull(tmp_dir, dvc, mocker, local_remote):
def test_repro_allow_missing_upstream_stage_modified(
tmp_dir, dvc, mocker, local_remote
):
"""https://github.com/iterative/dvc/issues/9530"""
"""https://github.com/treeverse/dvc/issues/9530"""
tmp_dir.gen("params.yaml", "param: 1")
dvc.stage.add(
name="create-foo", cmd="echo ${param} > foo", params=["param"], outs=["foo"]
+1 -1
View File
@@ -723,7 +723,7 @@ def test_add_symlink_file(tmp_dir, dvc):
).is_symlink()
# Test that subsequent add succeeds
# See https://github.com/iterative/dvc/issues/4654
# See https://github.com/treeverse/dvc/issues/4654
dvc.add(os.path.join("dir", "foo"))
+6 -6
View File
@@ -88,8 +88,8 @@ def test_config_set_in_non_dvc_repo(tmp_dir, caplog):
[
(["core.analytics"], 0, "False"),
(["core.remote"], 0, "myremote"),
(["remote.myremote.profile"], 0, "iterative"),
(["remote.myremote.profile", "--local"], 0, "iterative"),
(["remote.myremote.profile"], 0, "treeverse"),
(["remote.myremote.profile", "--local"], 0, "treeverse"),
(
["remote.myremote.profile", "--project"],
251,
@@ -122,7 +122,7 @@ def test_config_get(tmp_dir, dvc, capsys, caplog, args, ret, msg):
textwrap.dedent(
"""\
['remote "myremote"']
profile = iterative
profile = treeverse
['remote "other"']
url = gs://bucket/path
"""
@@ -167,7 +167,7 @@ def test_config_list(tmp_dir, dvc, capsys):
textwrap.dedent(
"""\
['remote "myremote"']
profile = iterative
profile = treeverse
access_key_id = abcde
secret_access_key = 123456
['remote "other"']
@@ -181,7 +181,7 @@ def test_config_list(tmp_dir, dvc, capsys):
out, _ = capsys.readouterr()
assert "remote.myremote.url=s3://bucket/path" in out
assert "remote.myremote.region=us-east-2" in out
assert "remote.myremote.profile=iterative" in out
assert "remote.myremote.profile=treeverse" in out
assert "remote.myremote.access_key_id=abcde" in out
assert "remote.myremote.secret_access_key=123456" in out
assert "remote.other.url=gs://bucket/path" in out
@@ -242,7 +242,7 @@ def test_merging_two_levels(dvc):
def test_config_loads_without_error_for_non_dvc_repo(tmp_dir):
# regression testing for https://github.com/iterative/dvc/issues/3328
# regression testing for https://github.com/treeverse/dvc/issues/3328
Config.from_cwd(validate=True)
+2 -2
View File
@@ -730,12 +730,12 @@ def test_pull_allow_missing(tmp_dir, dvc, local_remote):
def test_pull_granular_excluding_import_that_cannot_be_pulled(
tmp_dir, dvc, local_remote, mocker
):
"""Regression test for https://github.com/iterative/dvc/issues/10309."""
"""Regression test for https://github.com/treeverse/dvc/issues/10309."""
mocker.patch("dvc.fs.dvc._DVCFileSystem", side_effect=CloneError("SCM error"))
(stage,) = tmp_dir.dvc_gen({"dir": {"foo": "foo", "bar": "bar"}})
imp_stage = dvc.imp(
"https://user:[email protected]/iterative/dvc.git",
"https://user:[email protected]/treeverse/dvc.git",
"dir",
out="new_dir",
rev="HEAD",
+2 -2
View File
@@ -578,7 +578,7 @@ def test_root_from_file_to_dir(M, tmp_dir, dvc, scm):
def test_empty_dir(tmp_dir, scm, dvc, M):
# regression testing for https://github.com/iterative/dvc/issues/8958
# regression testing for https://github.com/treeverse/dvc/issues/8958
tmp_dir.dvc_gen({"data": {"foo": "foo"}})
remove("data")
@@ -1216,7 +1216,7 @@ def test_renames(
def test_shallow_should_iterate_upto_tracked_directory(
M, tmp_dir, dvc, scm, local_remote
):
"""Testing regression for https://github.com/iterative/dvc/issues/10899."""
"""Testing regression for https://github.com/treeverse/dvc/issues/10899."""
tmp_dir.scm_gen({"dir": {".gitkeep": ""}}, commit="mk dir")
dataset_root = join("dir", "data", "")
+1 -1
View File
@@ -101,7 +101,7 @@ def test_pull_subdir_file(tmp_dir, erepo_dir):
def test_relative_remote(erepo_dir, tmp_dir):
# these steps reproduce the script on this issue:
# https://github.com/iterative/dvc/issues/2756
# https://github.com/treeverse/dvc/issues/2756
with erepo_dir.chdir():
erepo_dir.dvc_gen("file", "contents", commit="create file")
+1 -1
View File
@@ -160,7 +160,7 @@ def test_non_cached_output(tmp_dir, erepo_dir):
assert (tmp_dir / dst).read_text().strip() == "hello"
# https://github.com/iterative/dvc/pull/2837#discussion_r352123053
# https://github.com/treeverse/dvc/pull/2837#discussion_r352123053
def test_absolute_file_outside_repo(tmp_dir, erepo_dir):
with pytest.raises(FileNotFoundError):
Repo.get(os.fspath(erepo_dir), "/root/")
+1 -1
View File
@@ -405,7 +405,7 @@ def test_import_non_existing(erepo_dir, tmp_dir, dvc):
with pytest.raises(FileNotFoundError):
tmp_dir.dvc.imp(os.fspath(erepo_dir), "invalid_output")
# https://github.com/iterative/dvc/pull/2837#discussion_r352123053
# https://github.com/treeverse/dvc/pull/2837#discussion_r352123053
with pytest.raises(FileNotFoundError):
tmp_dir.dvc.imp(os.fspath(erepo_dir), "/root/", "root")
+1 -1
View File
@@ -109,7 +109,7 @@ def test_gen_dvcignore(tmp_dir):
def test_init_when_ignored_by_git(tmp_dir, scm, caplog):
# https://github.com/iterative/dvc/issues/3738
# https://github.com/treeverse/dvc/issues/3738
tmp_dir.gen({".gitignore": ".*"})
with caplog.at_level(logging.ERROR, logger="dvc"):
assert main(["init"]) == 1
+1 -1
View File
@@ -125,7 +125,7 @@ def assert_index_equal(first, second, strict=True, ordered=True):
def test_skip_graph_checks(dvc, mocker):
# See https://github.com/iterative/dvc/issues/2671 for more info
# See https://github.com/treeverse/dvc/issues/2671 for more info
mock_build_graph = mocker.spy(Index.graph, "fget")
# sanity check
+2 -2
View File
@@ -241,7 +241,7 @@ def test_compose_and_dump_dir_module(
def test_compose_and_dump_yaml_handles_string(tmp_dir):
"""Regression test for https://github.com/iterative/dvc/issues/8583"""
"""Regression test for https://github.com/treeverse/dvc/issues/8583"""
from dvc.utils.hydra import compose_and_dump
config = tmp_dir / "conf" / "config.yaml"
@@ -253,7 +253,7 @@ def test_compose_and_dump_yaml_handles_string(tmp_dir):
def test_compose_and_dump_resolves_interpolation(tmp_dir):
"""Regression test for https://github.com/iterative/dvc/issues/9196"""
"""Regression test for https://github.com/treeverse/dvc/issues/9196"""
from dvc.utils.hydra import compose_and_dump
config = tmp_dir / "conf" / "config.yaml"
+1 -1
View File
@@ -119,7 +119,7 @@ def test_show_ascii(repo):
def test_show_dot(repo):
# dot file rendering is not deterministic though graph
# output doesn't depend upon order of lines. Use sorted values
# https://github.com/iterative/dvc/pull/7725
# https://github.com/treeverse/dvc/pull/7725
expected = [
"\"stage: '1'\";",
"\"stage: '2'\";",
+1 -1
View File
@@ -214,7 +214,7 @@ def test_read_params_py(tmp_dir, dvc):
def test_params_py_tuple_status(tmp_dir, dvc):
"""https://github.com/iterative/dvc/issues/8803"""
"""https://github.com/treeverse/dvc/issues/8803"""
parameters_file = "parameters.py"
tmp_dir.gen(parameters_file, "TUPLE = (10, 100)\n")
dep = ParamsDependency(Stage(dvc), parameters_file, ["TUPLE"])
+1 -1
View File
@@ -42,7 +42,7 @@ def test_save_missing(dvc, mocker):
), # hdfs checksum
# Not much we can do about hex and oct values without writing our own
# parser. So listing these test cases just to acknowledge this.
# See https://github.com/iterative/dvc/issues/3331.
# See https://github.com/treeverse/dvc/issues/3331.
(0x3451, "13393"),
(0o1244, "676"),
],
+1 -1
View File
@@ -69,7 +69,7 @@ def session_app(tmp_path_factory) -> FSApp:
"""Session scoped experiments queue celery app."""
from kombu.transport.filesystem import Channel
# related to https://github.com/iterative/dvc-task/issues/61
# related to https://github.com/treeverse/dvc-task/issues/61
Channel.QoS.restore_at_shutdown = False
from dvc_task.app import FSApp
+1 -1
View File
@@ -74,7 +74,7 @@ def test_locked(mocker):
def test_skip_graph_checks(tmp_dir, dvc, mocker, run_copy):
# See https://github.com/iterative/dvc/issues/2671 for more info
# See https://github.com/treeverse/dvc/issues/2671 for more info
from dvc.repo.index import Index
mock_build_graph = mocker.spy(Index.graph, "fget")
+6 -6
View File
@@ -167,16 +167,16 @@ def test_system_info():
@pytest.mark.parametrize(
"git_remote",
[
"git://github.com/iterative/dvc.git",
"[email protected]:iterative/dvc.git",
"http://github.com/iterative/dvc.git",
"https://github.com/iterative/dvc.git",
"ssh://[email protected]/iterative/dvc.git",
"git://github.com/treeverse/dvc.git",
"[email protected]:treeverse/dvc.git",
"http://github.com/treeverse/dvc.git",
"https://github.com/treeverse/dvc.git",
"ssh://[email protected]/treeverse/dvc.git",
],
)
def test_git_remote_hash(mocker, git_remote):
m = mocker.patch("dvc.analytics._git_remote_url", return_value=git_remote)
expected = hashlib.md5(b"iterative/dvc.git", usedforsecurity=False).hexdigest()
expected = hashlib.md5(b"treeverse/dvc.git", usedforsecurity=False).hexdigest()
assert analytics._git_remote_path_hash(None) == expected
m.assert_called_once_with(None)
+2 -2
View File
@@ -158,14 +158,14 @@ def test_check(mocker, updater):
None,
(
"Find the latest release at "
"https://github.com/iterative/dvc/releases/latest."
"https://github.com/treeverse/dvc/releases/latest."
),
),
(
"unknown",
(
"Find the latest release at "
"https://github.com/iterative/dvc/releases/latest."
"https://github.com/treeverse/dvc/releases/latest."
),
),
],
+2 -2
View File
@@ -46,7 +46,7 @@ def test_notify_refs(mocker, status_code, side_effect):
mock_post = mocker.patch("requests.Session.post", return_value=response)
notify_refs(
"[email protected]:iterative/dvc.git",
"[email protected]:treeverse/dvc.git",
"TOKEN",
pushed=["p1", "p2"],
removed=["r1", "r2"],
@@ -56,7 +56,7 @@ def test_notify_refs(mocker, status_code, side_effect):
assert mock_post.call_args == mocker.call(
urljoin(STUDIO_URL, "/webhook/dvc"),
json={
"repo_url": "[email protected]:iterative/dvc.git",
"repo_url": "[email protected]:treeverse/dvc.git",
"client": "dvc",
"refs": {
"pushed": ["p1", "p2"],