aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/api_tests.txt8
-rw-r--r--tests/manual_test.py23
2 files changed, 8 insertions, 23 deletions
diff --git a/tests/api_tests.txt b/tests/api_tests.txt
index 86ca245d..d34f2314 100644
--- a/tests/api_tests.txt
+++ b/tests/api_tests.txt
@@ -341,8 +341,8 @@ Environment Markers
>>> print(im("sys_platform"))
Comparison or logical expression expected
- >>> print(im("sys_platform==")) # doctest: +ELLIPSIS
- unexpected EOF while parsing (...line 1)
+ >>> print(im("sys_platform=="))
+ invalid syntax
>>> print(im("sys_platform=='win32'"))
False
@@ -353,8 +353,8 @@ Environment Markers
>>> print(im("(extra)"))
Comparison or logical expression expected
- >>> print(im("(extra")) # doctest: +ELLIPSIS
- unexpected EOF while parsing (...line 1)
+ >>> print(im("(extra"))
+ invalid syntax
>>> print(im("os.open('foo')=='y'"))
Language feature not supported in environment markers
diff --git a/tests/manual_test.py b/tests/manual_test.py
index 3eab99e1..e6489b1c 100644
--- a/tests/manual_test.py
+++ b/tests/manual_test.py
@@ -1,31 +1,16 @@
#!/usr/bin/env python
-import sys
-
-if sys.version_info[0] >= 3:
- raise NotImplementedError('Py3 not supported in this test yet')
+import sys
import os
import shutil
import tempfile
+import subprocess
from distutils.command.install import INSTALL_SCHEMES
from string import Template
from setuptools.compat import urlopen
-try:
- import subprocess
- def _system_call(*args):
- assert subprocess.call(args) == 0
-except ImportError:
- # Python 2.3
- def _system_call(*args):
- # quoting arguments if windows
- if sys.platform == 'win32':
- def quote(arg):
- if ' ' in arg:
- return '"%s"' % arg
- return arg
- args = [quote(arg) for arg in args]
- assert os.system(' '.join(args)) == 0
+def _system_call(*args):
+ assert subprocess.call(args) == 0
def tempdir(func):
def _tempdir(*args, **kwargs):