Skip to content

Commit 659a018

Browse files
committed
Change expected resolver error messages in YAML tests
1 parent 1b61575 commit 659a018

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tests/yaml/conflict_2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ cases:
2323
- state: null
2424
error:
2525
stderr: >-
26-
Cannot install six<1.12 and virtualenv 20.0.2 because these
26+
Cannot install six<1.12 and virtualenv==20.0.2 because these
2727
package versions have conflicting dependencies.

tests/yaml/conflicting_diamond.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cases:
1212
- error:
1313
code: 1
1414
stderr: >-
15-
Cannot install A and A because these package
16-
versions have conflicting dependencies.
15+
Cannot install A because these package versions have
16+
conflicting dependencies.
1717
# TODO: Tweak this error message to make sense.
1818
# https://github.com/pypa/pip/issues/8495

tests/yaml/large.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,6 @@ cases:
287287
error:
288288
code: 1
289289
stderr: >-
290-
Cannot install six==1.8.2, html5lib 1.0.1, six==1.8.2 and
291-
html5lib 0.999999999 because these package versions have
290+
Cannot install html5lib==0.999999999, html5lib==1.0.1
291+
and six==1.8.2 because these package versions have
292292
conflicting dependencies.

0 commit comments

Comments
 (0)