[Pytest-commit] commit/tox: RonnyPfannschmidt: Merged in msabramo/tox/fix_test_quickstart (pull request #99)

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Sun Apr 27 19:48:10 CEST 2014


1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/6f9368b8b63e/
Changeset:   6f9368b8b63e
User:        RonnyPfannschmidt
Date:        2014-04-27 19:48:07
Summary:     Merged in msabramo/tox/fix_test_quickstart (pull request #99)

Fix test_quickstart failures
Affected #:  1 file

diff -r 5646e78d05b27b3c7f310bbcef29f765d06a9942 -r 6f9368b8b63e8f1f150abc6ccdfaa113fcc05a2c tests/test_quickstart.py
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -28,7 +28,7 @@
         monkeypatch.setattr(
             tox._quickstart, 'term_input',
             self.get_mock_term_input(
-                ['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'py.test', 'pytest']))
+                ['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'py.test', 'pytest']))
 
         tox._quickstart.main(argv=['tox-quickstart'])
 
@@ -39,7 +39,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands = py.test
@@ -52,7 +52,7 @@
     def test_quickstart_main_choose_individual_pythons_and_nose_adds_deps(self, monkeypatch):
         monkeypatch.setattr(
             tox._quickstart, 'term_input',
-            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
+            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
                                      'nosetests', '']))
 
         tox._quickstart.main(argv=['tox-quickstart'])
@@ -64,7 +64,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands = nosetests
@@ -77,7 +77,7 @@
     def test_quickstart_main_choose_individual_pythons_and_trial_adds_deps(self, monkeypatch):
         monkeypatch.setattr(
             tox._quickstart, 'term_input',
-            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
+            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
                                       'trial', '']))
 
         tox._quickstart.main(argv=['tox-quickstart'])
@@ -89,7 +89,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands = trial
@@ -102,7 +102,7 @@
     def test_quickstart_main_choose_individual_pythons_and_pytest_adds_deps(self, monkeypatch):
         monkeypatch.setattr(
             tox._quickstart, 'term_input',
-            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
+            self.get_mock_term_input(['4', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N',
                                       'py.test', '']))
         tox._quickstart.main(argv=['tox-quickstart'])
 
@@ -113,7 +113,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands = py.test
@@ -185,7 +185,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy, jython
+envlist = py26, py27, py32, py33, py34, pypy, jython
 
 [testenv]
 commands = py.test
@@ -198,7 +198,7 @@
     def test_quickstart_main_choose_individual_pythons_and_defaults(self, monkeypatch):
         monkeypatch.setattr(
             tox._quickstart, 'term_input',
-            self.get_mock_term_input(['4', '', '', '', '', '', '', '', '', '', '']))
+            self.get_mock_term_input(['4', '', '', '', '', '', '', '', '', '', '', '']))
 
         tox._quickstart.main(argv=['tox-quickstart'])
 
@@ -209,7 +209,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy, jython
+envlist = py26, py27, py32, py33, py34, pypy, jython
 
 [testenv]
 commands = {envpython} setup.py test
@@ -239,7 +239,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy, jython
+envlist = py26, py27, py32, py33, py34, pypy, jython
 
 [testenv]
 commands = {envpython} setup.py test
@@ -257,6 +257,7 @@
             'py27': True,
             'py32': True,
             'py33': True,
+            'py34': True,
             'pypy': True,
             'commands': 'py.test',
             'deps': 'pytest',
@@ -268,7 +269,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 commands = py.test
@@ -339,6 +340,7 @@
             'py27': True,
             'py32': True,
             'py33': True,
+            'py34': True,
             'pypy': True,
             'commands': 'nosetests -v',
             'deps': 'nose',
@@ -350,7 +352,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py32, py33, pypy
+envlist = py27, py32, py33, py34, pypy
 
 [testenv]
 commands = nosetests -v

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


More information about the pytest-commit mailing list