new test regime

davidjb · Oct 26, 2012 · 40a4743 · 40a4743
1 parent 58b349a
commit 40a4743
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/pyramid_deform/tests.py b/pyramid_deform/tests.py
@@ -139,7 +139,7 @@ def check_form(self, form):
         inst()
         form = inst.form
         # All options should end up on the form, overriding any defaults
-        for key, value in dict(form_options).iteritems():
+        for key, value in dict(form_options).items():
             self.assertEqual(getattr(form, key), value)
 
 class TestFormWizardView(unittest.TestCase):

diff --git a/tox.ini b/tox.ini
@@ -1,21 +1,15 @@
 [tox]
-envlist = py26,py27,py32,cover
+envlist = py26,py27,py32,py33,cover
 
 [testenv]
 commands =
-    python setup.py test -q
-deps =
-    nose
-    Mock
-    coverage
+    python setup.py dev
+    python setup.py nosetests
 
 [testenv:cover]
 basepython =
     python2.6
 commands = 
     python setup.py nosetests --with-xunit --with-xcoverage
 deps =
-    nose
-    Mock
-    coverage
     nosexcover