Merge pull request #865 from pfmoore/appveyor

Add support for testing on Appveyor

2 files changed, 33 insertions, 1 deletions

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..0d7ed7a
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,25 @@
+environment:
+
+  matrix:
+    # For Python versions available on Appveyor, see
+    # http://www.appveyor.com/docs/installed-software#python
+
+    - PYTHON: "C:\\Python26"
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python26-x64"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python33-x64"
+    - PYTHON: "C:\\Python34-x64"
+    - PYTHON: "C:\\Python35-x64"
+
+install:
+  # We need tox installed for the tests
+  - "%PYTHON%\\Scripts\\pip.exe install tox"
+
+build: off
+
+test_script:
+  - "%PYTHON%\\Scripts\\tox.exe -e py"
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index c157de3..9682ef0 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -1,6 +1,7 @@
 import sys
 import subprocess
 import virtualenv
+import pytest
 
 VIRTUALENV_SCRIPT = virtualenv.__file__
 
@@ -21,10 +22,16 @@ def test_commandline_explicit_interp(tmpdir):
         str(tmpdir.join('venv'))
     ])
 
+# The registry lookups to support the abbreviated "-p 3.5" form of specifying
+# a Python interpreter on Windows don't seem to work with Python 3.5. The
+# registry layout is not well documented, and it's not clear that the feature
+# is sufficiently widely used to be worth fixing.
+# See https://github.com/pypa/virtualenv/issues/864
+@pytest.mark.skipif("sys.platform == 'win32' and sys.version_info[:2] >= (3,5)")
 def test_commandline_abbrev_interp(tmpdir):
     """Specifying abbreviated forms of the Python interpreter should work"""
     if sys.platform == 'win32':
-        fmt = 'py%s%s'
+        fmt = '%s.%s'
     else:
         fmt = 'python%s.%s'
     abbrev = fmt % (sys.version_info[0], sys.version_info[1])