Blame SOURCES/pytest.patch

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