Skip to content

Commit 1591d6b

Browse files
committed
Move test_register away from on-disc test fixtures
The tests in this module do not care about the content of the wheel.
1 parent 1186199 commit 1591d6b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

tests/test_register.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
from twine import exceptions
66
from twine.commands import register
77

8-
from . import helpers
9-
108

119
@pytest.fixture()
1210
def register_settings(make_settings):
@@ -21,7 +19,7 @@ def register_settings(make_settings):
2119
)
2220

2321

24-
def test_successful_register(register_settings):
22+
def test_successful_register(register_settings, test_wheel):
2523
"""Return a successful result for a valid repository url and package."""
2624
stub_response = pretend.stub(
2725
is_redirect=False,
@@ -36,12 +34,12 @@ def test_successful_register(register_settings):
3634

3735
register_settings.create_repository = lambda: stub_repository
3836

39-
result = register.register(register_settings, helpers.WHEEL_FIXTURE)
37+
result = register.register(register_settings, str(test_wheel))
4038

4139
assert result is None
4240

4341

44-
def test_exception_for_redirect(register_settings):
42+
def test_exception_for_redirect(register_settings, test_wheel):
4543
"""Raise an exception when repository URL results in a redirect."""
4644
repository_url = register_settings.repository_config["repository"]
4745
redirect_url = "https://malicious.website.org/danger/"
@@ -62,10 +60,10 @@ def test_exception_for_redirect(register_settings):
6260
exceptions.RedirectDetected,
6361
match=rf"{repository_url}.+{redirect_url}.+\nIf you trust these URLs",
6462
):
65-
register.register(register_settings, helpers.WHEEL_FIXTURE)
63+
register.register(register_settings, str(test_wheel))
6664

6765

68-
def test_non_existent_package(register_settings):
66+
def test_non_existent_package(register_settings, test_wheel):
6967
"""Raise an exception when package file doesn't exist."""
7068
stub_repository = pretend.stub()
7169

@@ -80,7 +78,7 @@ def test_non_existent_package(register_settings):
8078

8179

8280
@pytest.mark.parametrize("repo", ["pypi", "testpypi"])
83-
def test_values_from_env_pypi(monkeypatch, repo):
81+
def test_values_from_env_pypi(monkeypatch, repo, test_wheel):
8482
"""Use env vars for settings when run from command line."""
8583

8684
def none_register(*args, **settings_kwargs):
@@ -96,14 +94,14 @@ def none_register(*args, **settings_kwargs):
9694
}
9795
for key, value in testenv.items():
9896
monkeypatch.setenv(key, value)
99-
cli.dispatch(["register", helpers.WHEEL_FIXTURE])
97+
cli.dispatch(["register", str(test_wheel)])
10098
register_settings = replaced_register.calls[0].args[0]
10199
assert "pypipassword" == register_settings.password
102100
assert "pypiuser" == register_settings.username
103101
assert "/foo/bar.crt" == register_settings.cacert
104102

105103

106-
def test_values_from_env_not_pypi(monkeypatch, write_config_file):
104+
def test_values_from_env_not_pypi(monkeypatch, write_config_file, test_wheel):
107105
"""Use env vars for settings when run from command line."""
108106
write_config_file(
109107
"""
@@ -131,7 +129,7 @@ def none_register(*args, **settings_kwargs):
131129
}
132130
for key, value in testenv.items():
133131
monkeypatch.setenv(key, value)
134-
cli.dispatch(["register", helpers.WHEEL_FIXTURE])
132+
cli.dispatch(["register", str(test_wheel)])
135133
register_settings = replaced_register.calls[0].args[0]
136134
assert "pypipassword" == register_settings.password
137135
assert "someusername" == register_settings.username

0 commit comments

Comments
 (0)