5
5
from twine import exceptions
6
6
from twine .commands import register
7
7
8
- from . import helpers
9
-
10
8
11
9
@pytest .fixture ()
12
10
def register_settings (make_settings ):
@@ -21,7 +19,7 @@ def register_settings(make_settings):
21
19
)
22
20
23
21
24
- def test_successful_register (register_settings ):
22
+ def test_successful_register (register_settings , test_wheel ):
25
23
"""Return a successful result for a valid repository url and package."""
26
24
stub_response = pretend .stub (
27
25
is_redirect = False ,
@@ -36,12 +34,12 @@ def test_successful_register(register_settings):
36
34
37
35
register_settings .create_repository = lambda : stub_repository
38
36
39
- result = register .register (register_settings , helpers . WHEEL_FIXTURE )
37
+ result = register .register (register_settings , str ( test_wheel ) )
40
38
41
39
assert result is None
42
40
43
41
44
- def test_exception_for_redirect (register_settings ):
42
+ def test_exception_for_redirect (register_settings , test_wheel ):
45
43
"""Raise an exception when repository URL results in a redirect."""
46
44
repository_url = register_settings .repository_config ["repository" ]
47
45
redirect_url = "https://malicious.website.org/danger/"
@@ -62,10 +60,10 @@ def test_exception_for_redirect(register_settings):
62
60
exceptions .RedirectDetected ,
63
61
match = rf"{ repository_url } .+{ redirect_url } .+\nIf you trust these URLs" ,
64
62
):
65
- register .register (register_settings , helpers . WHEEL_FIXTURE )
63
+ register .register (register_settings , str ( test_wheel ) )
66
64
67
65
68
- def test_non_existent_package (register_settings ):
66
+ def test_non_existent_package (register_settings , test_wheel ):
69
67
"""Raise an exception when package file doesn't exist."""
70
68
stub_repository = pretend .stub ()
71
69
@@ -80,7 +78,7 @@ def test_non_existent_package(register_settings):
80
78
81
79
82
80
@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 ):
84
82
"""Use env vars for settings when run from command line."""
85
83
86
84
def none_register (* args , ** settings_kwargs ):
@@ -96,14 +94,14 @@ def none_register(*args, **settings_kwargs):
96
94
}
97
95
for key , value in testenv .items ():
98
96
monkeypatch .setenv (key , value )
99
- cli .dispatch (["register" , helpers . WHEEL_FIXTURE ])
97
+ cli .dispatch (["register" , str ( test_wheel ) ])
100
98
register_settings = replaced_register .calls [0 ].args [0 ]
101
99
assert "pypipassword" == register_settings .password
102
100
assert "pypiuser" == register_settings .username
103
101
assert "/foo/bar.crt" == register_settings .cacert
104
102
105
103
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 ):
107
105
"""Use env vars for settings when run from command line."""
108
106
write_config_file (
109
107
"""
@@ -131,7 +129,7 @@ def none_register(*args, **settings_kwargs):
131
129
}
132
130
for key , value in testenv .items ():
133
131
monkeypatch .setenv (key , value )
134
- cli .dispatch (["register" , helpers . WHEEL_FIXTURE ])
132
+ cli .dispatch (["register" , str ( test_wheel ) ])
135
133
register_settings = replaced_register .calls [0 ].args [0 ]
136
134
assert "pypipassword" == register_settings .password
137
135
assert "someusername" == register_settings .username
0 commit comments