diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-13 01:28:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-13 01:28:36 +0000 |
| commit | e00cc7577445e384a2416eaa7bbc4a386fdd214c (patch) | |
| tree | a9625e62b521a87b68143af41b892d554924fc0d | |
| parent | 2eafc71af88bdd9e8e041b9421dac6313e79cf71 (diff) | |
| parent | 7a7820c4ff9509e3f79035b64e759acf88f176be (diff) | |
| download | heat-e00cc7577445e384a2416eaa7bbc4a386fdd214c.tar.gz | |
Merge "Add a way to run py34 tests from file"
| -rw-r--r-- | heat/tests/test_sync_point.py | 4 | ||||
| -rw-r--r-- | py3-testlist | 2 | ||||
| -rwxr-xr-x | tools/run-py3-tests.sh | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/heat/tests/test_sync_point.py b/heat/tests/test_sync_point.py index 171143c29..375d8103a 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 8b1378917..5d7bdcfcd 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 000000000..d69488d68 --- /dev/null +++ b/tools/run-py3-tests.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +testr init +testr run --parallel `cat py3-testlist` @@ -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] |