summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2019-11-09 17:52:17 -0500
committerNed Batchelder <ned@nedbatchelder.com>2019-11-09 21:06:43 -0500
commit07c0d6bc06b5bae61bc7588a004081bb9fd4a7fc (patch)
tree951f9da215421a82edd0a4e40f8d9a9da110144a
parent8fc01605ad3a80d7829ba8abbe567344c73b4ab5 (diff)
downloadpython-coveragepy-git-07c0d6bc06b5bae61bc7588a004081bb9fd4a7fc.tar.gz
CoverageData.lines doesn't sort its returned list
-rw-r--r--coverage/sqldata.py2
-rw-r--r--tests/test_api.py8
-rw-r--r--tests/test_plugins.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/coverage/sqldata.py b/coverage/sqldata.py
index 7616e2d6..1b44b9ce 100644
--- a/coverage/sqldata.py
+++ b/coverage/sqldata.py
@@ -827,7 +827,7 @@ class CoverageData(SimpleReprMixin):
nums = set()
for row in bitmaps:
nums.update(numbits_to_nums(row[0]))
- return sorted(nums)
+ return list(nums)
def arcs(self, filename):
"""Get the list of arcs executed for a file.
diff --git a/tests/test_api.py b/tests/test_api.py
index 786d6aab..c5803756 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -541,9 +541,9 @@ class ApiTest(CoverageTest):
suite_filename = filenames['testsuite.py']
data.set_query_context("multiply_six")
- self.assertEqual([2, 8], data.lines(suite_filename))
+ self.assertEqual([2, 8], sorted(data.lines(suite_filename)))
data.set_query_context("multiply_zero")
- self.assertEqual([2, 5], data.lines(suite_filename))
+ self.assertEqual([2, 5], sorted(data.lines(suite_filename)))
def test_switch_context_with_static(self):
# This test simulates a coverage-aware test runner,
@@ -582,9 +582,9 @@ class ApiTest(CoverageTest):
suite_filename = filenames['testsuite.py']
data.set_query_context("mysuite|multiply_six")
- self.assertEqual([2, 8], data.lines(suite_filename))
+ self.assertEqual([2, 8], sorted(data.lines(suite_filename)))
data.set_query_context("mysuite|multiply_zero")
- self.assertEqual([2, 5], data.lines(suite_filename))
+ self.assertEqual([2, 5], sorted(data.lines(suite_filename)))
def test_switch_context_unstarted(self):
# Coverage must be started to switch context
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 22796dc3..87690439 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -995,7 +995,7 @@ class DynamicContextPluginTest(CoverageTest):
data.set_query_context("test:HTML_TAG")
self.assertEqual([2], data.lines(filenames['rendering.py']))
data.set_query_context("test:RENDERERS")
- self.assertEqual([2, 5, 8, 11], data.lines(filenames['rendering.py']))
+ self.assertEqual([2, 5, 8, 11], sorted(data.lines(filenames['rendering.py'])))
def test_static_context(self):
self.make_plugin_capitalized_testnames('plugin_tests.py')
@@ -1045,7 +1045,7 @@ class DynamicContextPluginTest(CoverageTest):
def assert_context_lines(context, lines):
data.set_query_context(context)
- self.assertEqual(lines, data.lines(filenames['rendering.py']))
+ self.assertEqual(lines, sorted(data.lines(filenames['rendering.py'])))
assert_context_lines("doctest:HTML_TAG", [2])
assert_context_lines("testsuite.test_html_tag", [2])
@@ -1083,7 +1083,7 @@ class DynamicContextPluginTest(CoverageTest):
def assert_context_lines(context, lines):
data.set_query_context(context)
- self.assertEqual(lines, data.lines(filenames['rendering.py']))
+ self.assertEqual(lines, sorted(data.lines(filenames['rendering.py'])))
assert_context_lines("test:HTML_TAG", [2])
assert_context_lines("test:RENDERERS", [2, 5, 8, 11])