summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@jelmer.uk>2019-06-08 14:23:29 +0000
committerGitHub <noreply@github.com>2019-06-08 14:23:29 +0000
commitc1a25fb614de3bf41d76747865221d5c7a3fc085 (patch)
tree2124b320bce22eb67900072a19c6b88292b8051c
parent24049abad508a27216572992a8a961d09f13eb25 (diff)
parentc308ca14278da92c657c1a3a079fafb93443e0f0 (diff)
downloadtestresources-git-c1a25fb614de3bf41d76747865221d5c7a3fc085.tar.gz
Merge pull request #8 from testing-cabal/skip-flaky-testBasicSortTests
Skip flaky testBasicSortTests on Python 3.x
-rw-r--r--setup.cfg1
-rw-r--r--testresources/tests/test_optimising_test_suite.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index 87dfdb4..1a54518 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ classifier =
[extras]
test =
+ six
docutils
fixtures
testtools
diff --git a/testresources/tests/test_optimising_test_suite.py b/testresources/tests/test_optimising_test_suite.py
index d78edbb..89a1209 100644
--- a/testresources/tests/test_optimising_test_suite.py
+++ b/testresources/tests/test_optimising_test_suite.py
@@ -15,6 +15,7 @@
# license.
#
+import six
import testtools
import random
import testresources
@@ -537,6 +538,7 @@ class TestGraphStuff(testtools.TestCase):
permutations.append([case4, case1, case3, case2])
return permutations
+ @unittest2.skipIf(six.PY3, "Flaky on Python 3, see LP #1645008")
def testBasicSortTests(self):
# Test every permutation of inputs, with legacy tests.
# Cannot use equal costs because of the use of