1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- virtualenv-16.7.2/tests/test_virtualenv.py
+++ virtualenv-16.7.2/tests/test_virtualenv.py
@@ -10,9 +10,7 @@ import tempfile
import textwrap
import zipfile
-import pypiserver
import pytest
-import pytest_localserver.http
import six
import virtualenv
@@ -346,7 +344,7 @@ def test_install_python_bin():
py_exe_no_version = "python"
py_exe_version_major = "python%s" % sys.version_info[0]
py_exe_version_major_minor = "python{}.{}".format(sys.version_info[0], sys.version_info[1])
- required_executables = [py_exe_no_version, py_exe_version_major, py_exe_version_major_minor]
+ required_executables = [py_exe_version_major, py_exe_version_major_minor]
for pth in required_executables:
assert os.path.exists(os.path.join(bin_dir, pth)), "%s should exist in bin_dir" % pth
@@ -489,6 +487,7 @@ def test_create_environment_in_dir_with_
virtualenv.create_environment(ve_path)
+@pytest.mark.skip(reason="pypiserver et al are not packaged")
def test_create_environment_with_local_https_pypi(tmpdir):
"""Create virtual environment using local PyPI listening https with
certificate signed with custom certificate authority
@@ -643,7 +642,7 @@ def test_create_environment_with_old_pip
def test_license_builtin(clean_python):
_, bin_dir, _ = clean_python
proc = subprocess.Popen(
- (os.path.join(bin_dir, "python"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
+ (os.path.join(bin_dir, "python3"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
)
out_b, _ = proc.communicate(b"q\n")
out = out_b.decode()
--- virtualenv-16.7.2/tests/test_zipapp.py
+++ virtualenv-16.7.2/tests/test_zipapp.py
@@ -55,6 +55,7 @@ def test_zipapp_basic_invocation(call_zi
_test_basic_invocation(call_zipapp, tmp_path)
+@pytest.mark.skip(reason="requires network access")
def test_wheel_basic_invocation(call_wheel, tmp_path):
_test_basic_invocation(call_wheel, tmp_path)
@@ -91,6 +91,7 @@ def _test_invocation_dash_p(make_env, tm
assert_venv_looks_good(venv, [expected], "python{}".format(".exe" if virtualenv.IS_WIN else ""))
+@pytest.mark.skip(reason="no python2 available")
def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
_test_invocation_dash_p(call_zipapp, tmp_path)
@@ -95,6 +95,6 @@ def test_zipapp_invocation_dash_p(call_z
_test_invocation_dash_p(call_zipapp, tmp_path)
-@pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
+@pytest.mark.skip(reason="no python2 available")
def test_wheel_invocation_dash_p(call_wheel, tmp_path):
_test_invocation_dash_p(call_wheel, tmp_path)
--- virtualenv-16.7.2/tests/test_from_source.py
+++ virtualenv-16.7.2/tests/test_from_source.py
@@ -40,6 +40,7 @@ def test_use_from_source_sdist(sdist, tm
)
+@pytest.mark.skip(reason="requires network access")
def test_use_from_wheel(tmp_path, extracted_wheel, clean_python, monkeypatch, call_subprocess):
"""test that we can create a virtual environment by feeding to a clean python the wheels content"""
virtualenv_file = extracted_wheel / "virtualenv.py"
--- virtualenv-16.7.2/tests/test_source_content.py
+++ virtualenv-16.7.2/tests/test_source_content.py
@@ -41,6 +41,7 @@ def test_sdist_contains(sdist):
assert not extra, " | ".join(extra)
+@pytest.mark.skip(reason="requires network access")
def test_wheel_contains(extracted_wheel):
content = set(extracted_wheel.iterdir())
|
