Skip to content

Commit 986fb2b

Browse files
committed
Updated tests according to authenticator changes
1 parent be3e319 commit 986fb2b

File tree

2 files changed

+23
-64
lines changed

2 files changed

+23
-64
lines changed

Diff for: tests/fixtures/with_trusted_source/pyproject.toml

+5-48
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,19 @@
11
[tool.poetry]
2-
name = "my-package"
3-
version = "1.2.3"
4-
description = "Some description."
52
authors = [
6-
"Sébastien Eustace <[email protected]>"
3+
"Your Name <[email protected]>",
74
]
5+
description = "Some description."
86
license = "MIT"
9-
10-
readme = "README.rst"
11-
12-
homepage = "https://python-poetry.org"
13-
repository = "https://github.com/python-poetry/poetry"
14-
documentation = "https://python-poetry.org/docs"
15-
16-
keywords = ["packaging", "dependency", "poetry"]
17-
18-
classifiers = [
19-
"Topic :: Software Development :: Build Tools",
20-
"Topic :: Software Development :: Libraries :: Python Modules"
21-
]
7+
name = "my-package"
8+
version = "1.2.3"
229

2310
# Requirements
2411
[tool.poetry.dependencies]
2512
python = "~2.7 || ^3.6"
26-
cleo = "^0.6"
27-
pendulum = { git = "https://github.com/sdispater/pendulum.git", branch = "2.0" }
28-
requests = { version = "^2.18", optional = true, extras=[ "security" ] }
29-
pathlib2 = { version = "^2.2", python = "~2.7" }
30-
31-
orator = { version = "^0.9", optional = true }
32-
33-
# File dependency
34-
demo = { path = "../distributions/demo-0.1.0-py2.py3-none-any.whl" }
35-
36-
# Dir dependency with setup.py
37-
my-package = { path = "../project_with_setup/" }
38-
39-
# Dir dependency with pyproject.toml
40-
simple-project = { path = "../simple_project/" }
41-
42-
43-
[tool.poetry.extras]
44-
db = [ "orator" ]
4513

4614
[tool.poetry.dev-dependencies]
47-
pytest = "~3.4"
48-
49-
50-
[tool.poetry.scripts]
51-
my-script = "my_package:main"
52-
53-
54-
[tool.poetry.plugins."blogtool.parsers"]
55-
".rst" = "some_module::SomeClass"
56-
5715

5816
[[tool.poetry.source]]
5917
name = "foo"
60-
url = "https://foo.bar/simple/"
61-
default = true
6218
trusted = true
19+
url = "https://foo.bar/simple/"

Diff for: tests/installation/test_pip_installer.py

+18-16
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,14 @@ def test_install_with_certs(mocker: MockerFixture, key: str, option: str):
157157
assert cmd[cert_index + 1] == str(Path(client_path))
158158

159159

160-
def test_requirement_git_develop_true(installer: PipInstaller, package_git: Package):
161-
package_git.develop = True
162-
result = installer.requirement(package_git)
163-
expected = ["-e", "[email protected]:demo/demo.git@master#egg=demo"]
164-
165-
assert result == expected
166-
160+
def test_install_with_trusted_host(mocker: MockerFixture):
161+
mocker.patch(
162+
"poetry.utils.authenticator.Authenticator.get_certs_for_url",
163+
return_value={"trusted": True},
164+
)
167165

168-
def test_install_with_trusted_host():
166+
default = LegacyRepository("default", "https://foo.bar")
169167
pool = Pool()
170-
host = "foo.bar"
171-
172-
default = LegacyRepository("default", f"https://{host}", trusted=True)
173-
174168
pool.add_repository(default, default=True)
175169

176170
null_env = NullEnv()
@@ -181,18 +175,26 @@ def test_install_with_trusted_host():
181175
"foo",
182176
"0.0.0",
183177
source_type="legacy",
184-
source_reference=default._name,
185-
source_url=default._url,
178+
source_reference=default.name,
179+
source_url=default.url,
186180
)
187181

188182
installer.install(foo)
189183

190184
assert len(null_env.executed) == 1
191185
cmd = null_env.executed[0]
192186
assert "--trusted-host" in cmd
193-
trusted_host_index = cmd.index("--trusted-host")
187+
cert_index = cmd.index("--trusted-host")
188+
# Need to do the str(Path()) bit because Windows paths get modified by Path
189+
assert cmd[cert_index + 1] == "foo.bar"
190+
194191

195-
assert cmd[trusted_host_index + 1] == host
192+
def test_requirement_git_develop_true(installer: PipInstaller, package_git: Package):
193+
package_git.develop = True
194+
result = installer.requirement(package_git)
195+
expected = ["-e", "[email protected]:demo/demo.git@master#egg=demo"]
196+
197+
assert result == expected
196198

197199

198200
def test_uninstall_git_package_nspkg_pth_cleanup(

0 commit comments

Comments
 (0)