Merge "Update tox.ini and fix py34 issues"

tests/ironic_lib/test_utils.py

@@ -77,7 +77,7 @@ exit 1
                 self.assertRaises(processutils.ProcessExecutionError,
                                   utils.execute,
                                   tmpfilename, tmpfilename2, attempts=10,
-                                  process_input='foo',
+                                  process_input=b'foo',
                                   delay_on_retry=False)
             except OSError as e:
                 if e.errno == errno.EACCES:
@@ -128,7 +128,7 @@ grep foo
             try:
                 utils.execute(tmpfilename,
                               tmpfilename2,
-                              process_input='foo',
+                              process_input=b'foo',
                               attempts=2)
             except OSError as e:
                 if e.errno == errno.EACCES:

tox.ini

@@ -1,26 +1,20 @@
 [tox]
-envlist = py27,pep8
+envlist = py27,py34,pep8
 
 [testenv]
-sitepackages = False
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-         PYTHONHASHSEED=0
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
 commands =
-  # Use the lockutils wrapper to ensure that external locking works correctly
-  lockutils-wrapper python setup.py test --slowest --testr-args='{posargs}'
+  python setup.py test --slowest --testr-args='{posargs}'
 
 [flake8]
 show-source = True
-ignore = E123,E126,E127,E128,E129,E711,H405,H904
+ignore = E128,E129
 exclude = .venv,.tox,dist,doc,*.egg,.update-venv
 
 [testenv:pep8]
 commands = flake8 {posargs}
- 
+
 [testenv:venv]
-setenv = PYTHONHASHSEED=0
 commands = {posargs}