From a61de3c126c35d81d40ef268852b6fe7c6d14eda Mon Sep 17 00:00:00 2001 From: Sirushti Murugesan Date: Thu, 8 Oct 2015 17:21:27 +0530 Subject: [PATCH] py34: cleanup * Tests were skipped due to a mox3 bug. The bug has now been fixed and there's a new release of mox3. Unskip it. * Remove the tool run-py3-tests.sh which isn't needed anymore. blueprint heat-python34-support Change-Id: I304d87e4313148c10a2465bf92ae932f525bb4ce --- heat/tests/engine/test_scheduler.py | 2 -- heat/tests/test_stack.py | 2 -- tools/run-py3-tests.sh | 4 ---- 3 files changed, 8 deletions(-) delete mode 100755 tools/run-py3-tests.sh diff --git a/heat/tests/engine/test_scheduler.py b/heat/tests/engine/test_scheduler.py index cba474c35f..f1e29d5399 100644 --- a/heat/tests/engine/test_scheduler.py +++ b/heat/tests/engine/test_scheduler.py @@ -12,7 +12,6 @@ # under the License. import contextlib -import testtools import eventlet import six @@ -314,7 +313,6 @@ class DependencyTaskGroupTest(common.HeatTestCase): self.assertEqual(e1, exc) -@testtools.skipIf(six.PY3, "mox3 bug") class TaskTest(common.HeatTestCase): def setUp(self): diff --git a/heat/tests/test_stack.py b/heat/tests/test_stack.py index e2907f37b7..93bd74490d 100644 --- a/heat/tests/test_stack.py +++ b/heat/tests/test_stack.py @@ -21,7 +21,6 @@ import mock import mox from oslo_config import cfg import six -import testtools from heat.common import context from heat.common import exception @@ -1044,7 +1043,6 @@ class StackTest(common.HeatTestCase): '(a foo) is incorrect.', self.stack.status_reason) self.m.VerifyAll() - @testtools.skipIf(six.PY3, "skipped until review 193726 is merged") def test_stack_create_timeout(self): self.m.StubOutWithMock(scheduler.DependencyTaskGroup, '__call__') self.m.StubOutWithMock(timeutils, 'wallclock') diff --git a/tools/run-py3-tests.sh b/tools/run-py3-tests.sh deleted file mode 100755 index d69488d682..0000000000 --- a/tools/run-py3-tests.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -testr init -testr run --parallel `cat py3-testlist`