|
 |
d5f9b97 |
diff --git a/test-requirements.txt b/test-requirements.txt
|
|
|
d5f9b97 |
index 446a41f..0bf6dc3 100644
|
|
|
d5f9b97 |
--- a/test-requirements.txt
|
|
|
d5f9b97 |
+++ b/test-requirements.txt
|
|
|
d5f9b97 |
@@ -1,5 +1,5 @@
|
|
|
d5f9b97 |
# The order of packages is significant, because pip processes them in the order
|
|
|
d5f9b97 |
# of appearance. Changing the order has an impact on the overall integration
|
|
|
d5f9b97 |
# process, which may cause wedges in the gate later.
|
|
|
d5f9b97 |
-nose
|
|
|
d5f9b97 |
+pytest
|
|
|
d5f9b97 |
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
|
|
d5f9b97 |
diff --git a/test/compliancetest.py b/test/compliancetest.py
|
|
|
d5f9b97 |
index bf4e59c..a7285de 100644
|
|
|
d5f9b97 |
--- a/test/compliancetest.py
|
|
|
d5f9b97 |
+++ b/test/compliancetest.py
|
|
|
d5f9b97 |
@@ -6,15 +6,13 @@ import lockfile
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
class ComplianceTest(object):
|
|
|
d5f9b97 |
- def __init__(self):
|
|
|
d5f9b97 |
- self.saved_class = lockfile.LockFile
|
|
|
d5f9b97 |
-
|
|
|
d5f9b97 |
def _testfile(self):
|
|
|
d5f9b97 |
"""Return platform-appropriate file. Helper for tests."""
|
|
|
d5f9b97 |
import tempfile
|
|
|
d5f9b97 |
return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid())
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
def setup(self):
|
|
|
d5f9b97 |
+ self.saved_class = lockfile.LockFile
|
|
|
d5f9b97 |
lockfile.LockFile = self.class_to_test
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
def teardown(self):
|
|
|
d5f9b97 |
diff --git a/tox.ini b/tox.ini
|
|
|
d5f9b97 |
index 750ad5f..7bfd923 100644
|
|
|
d5f9b97 |
--- a/tox.ini
|
|
|
d5f9b97 |
+++ b/tox.ini
|
|
|
d5f9b97 |
@@ -4,7 +4,7 @@ envlist = py27,py32,py33,py34
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
[testenv]
|
|
|
d5f9b97 |
deps = -r{toxinidir}/test-requirements.txt
|
|
|
d5f9b97 |
-commands=nosetests
|
|
|
d5f9b97 |
+commands=pytest
|
|
|
d5f9b97 |
|
|
|
d5f9b97 |
[testenv:venv]
|
|
|
d5f9b97 |
commands = {posargs}
|