Skip to content

test: skip non supported remotes fast in api tests #2870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/func/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def run_dvc(*argv):


@pytest.mark.parametrize("remote_url", remote_params, indirect=True)
def test_get_url(repo_dir, dvc_repo, remote_url):
def test_get_url(remote_url, repo_dir, dvc_repo):
run_dvc("remote", "add", "-d", "upstream", remote_url)
dvc_repo.add(repo_dir.FOO)

Expand All @@ -84,7 +84,7 @@ def test_get_url(repo_dir, dvc_repo, remote_url):


@pytest.mark.parametrize("remote_url", remote_params, indirect=True)
def test_get_url_external(dvc_repo, erepo, remote_url):
def test_get_url_external(remote_url, dvc_repo, erepo):
_set_remote_url_and_commit(erepo.dvc, remote_url)

# Using file url to force clone to tmp repo
Expand All @@ -94,7 +94,7 @@ def test_get_url_external(dvc_repo, erepo, remote_url):


@pytest.mark.parametrize("remote_url", all_remote_params, indirect=True)
def test_open(repo_dir, dvc_repo, remote_url):
def test_open(remote_url, repo_dir, dvc_repo):
run_dvc("remote", "add", "-d", "upstream", remote_url)
dvc_repo.add(repo_dir.FOO)
run_dvc("push")
Expand All @@ -107,7 +107,7 @@ def test_open(repo_dir, dvc_repo, remote_url):


@pytest.mark.parametrize("remote_url", all_remote_params, indirect=True)
def test_open_external(dvc_repo, erepo, remote_url):
def test_open_external(remote_url, dvc_repo, erepo):
erepo.dvc.scm.checkout("branch")
_set_remote_url_and_commit(erepo.dvc, remote_url)
erepo.dvc.scm.checkout("master")
Expand All @@ -127,7 +127,7 @@ def test_open_external(dvc_repo, erepo, remote_url):


@pytest.mark.parametrize("remote_url", all_remote_params, indirect=True)
def test_missing(repo_dir, dvc_repo, remote_url):
def test_missing(remote_url, repo_dir, dvc_repo):
run_dvc("add", repo_dir.FOO)
run_dvc("remote", "add", "-d", "upstream", remote_url)

Expand Down