From 7a7820c4ff9509e3f79035b64e759acf88f176be Mon Sep 17 00:00:00 2001
From: Sirushti Murugesan <sirushti.murugesan@hp.com>
Date: Mon, 29 Jun 2015 09:06:06 +0530
Subject: [PATCH] Add a way to run py34 tests from file

Also, fix minor flake8 issue related to Long literal.

This should now have the python34 gate job passing.

partial blueprint heat-python34-support

Change-Id: I7f85e7251fc96587df0b43daac202c38542a6f6c
---
 heat/tests/test_sync_point.py | 4 ++--
 py3-testlist                  | 2 +-
 tools/run-py3-tests.sh        | 4 ++++
 tox.ini                       | 4 +---
 4 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100755 tools/run-py3-tests.sh

diff --git a/heat/tests/test_sync_point.py b/heat/tests/test_sync_point.py
index 171143c299..375d8103a0 100644
--- a/heat/tests/test_sync_point.py
+++ b/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)
diff --git a/py3-testlist b/py3-testlist
index 8b13789179..5d7bdcfcde 100644
--- a/py3-testlist
+++ b/py3-testlist
@@ -1 +1 @@
-
+heat.tests.test_version
diff --git a/tools/run-py3-tests.sh b/tools/run-py3-tests.sh
new file mode 100755
index 0000000000..d69488d682
--- /dev/null
+++ b/tools/run-py3-tests.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+testr init
+testr run --parallel `cat py3-testlist`
diff --git a/tox.ini b/tox.ini
index fc32980bb9..1305101b4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,12 +62,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]