Merge "Add a way to run py34 tests from file"

heat/tests/test_sync_point.py

@@ -64,5 +64,5 @@ class SyncPointTestCase(common.HeatTestCase):
         self.assertTrue(mock_callback.called)
 
     def test_serialize_input_data(self):
-        res = sync_point.serialize_input_data({(3L, 8): None})
-        self.assertEqual({'input_data': [[[3L, 8], None]]}, res)
+        res = sync_point.serialize_input_data({(3, 8): None})
+        self.assertEqual({'input_data': [[[3, 8], None]]}, res)

py3-testlist

@@ -1 +1 @@
-
+heat.tests.test_version

tools/run-py3-tests.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+testr init
+testr run --parallel `cat py3-testlist`

tox.ini

@@ -61,12 +61,10 @@ commands =
 # FIXME(sirushtim): Sneak in flake8 here for now. This env will also be used
 #                   to run the tests in the near future.
 [testenv:py34]
-deps = -r{toxinidir}/requirements-py3.txt
-       -r{toxinidir}/test-requirements-py3.txt
 commands =
   flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib heat_integrationtests
   find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.pyc' -delete
-  python setup.py testr --slowest --testr-args='--load-list py3-testlist'
+  bash tools/run-py3-tests.sh
 
 
 [flake8]