summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorFederico Ressi <fressi@redhat.com>2020-07-09 10:35:22 +0200
committerFederico Ressi <fressi@redhat.com>2020-07-09 10:35:22 +0200
commit9ca12a11b060027fbd290e0255588df3a0e79ff0 (patch)
tree7c678dd86791b6509dd892426eef4164a8e8ba94 /testtools
parentdbe26aaf591be44c58ee09f2882934eb6621c07a (diff)
downloadtesttools-9ca12a11b060027fbd290e0255588df3a0e79ff0.tar.gz
Compare items using sets instead of sequences
Diffstat (limited to 'testtools')
-rw-r--r--testtools/testcase.py15
-rw-r--r--testtools/tests/twistedsupport/test_spinner.py4
2 files changed, 2 insertions, 17 deletions
diff --git a/testtools/testcase.py b/testtools/testcase.py
index c6fe3fe..678b6de 100644
--- a/testtools/testcase.py
+++ b/testtools/testcase.py
@@ -454,21 +454,6 @@ class TestCase(unittest.TestCase):
matcher = IsInstance(klass)
self.assertThat(obj, matcher, msg)
- def assertItemsEqual(self, expected, observed, message=None):
- """Assert that items in 'expected' are equal to items in 'observed'.
-
- It is equivalent to assertEqual(sorted(expected), sorted(observed))
-
- NOTE: items don't have to be hashable
-
- :param expected: The expected value.
- :param observed: The observed value.
- :param message: An optional message to include in the error.
- """
- matcher = _FlippedEquals(sorted(expected))
- matchee = sorted(observed)
- self.assertThat(matchee, matcher, message)
-
def assertRaises(self, excClass, callableObj, *args, **kwargs):
"""Fail unless an exception of class excClass is thrown
by callableObj when invoked with arguments args and keyword
diff --git a/testtools/tests/twistedsupport/test_spinner.py b/testtools/tests/twistedsupport/test_spinner.py
index d2b30f2..40cd66a 100644
--- a/testtools/tests/twistedsupport/test_spinner.py
+++ b/testtools/tests/twistedsupport/test_spinner.py
@@ -141,12 +141,12 @@ class TestRunInReactor(NeedsTwistedTestCase):
None, (getattr(signal, name, None) for name in signals)))
for sig in signals:
self.addCleanup(signal.signal, sig, signal.getsignal(sig))
- new_hdlrs = list(lambda *a: None for _ in signals)
+ new_hdlrs = set(lambda *a: None for _ in signals)
for sig, hdlr in zip(signals, new_hdlrs):
signal.signal(sig, hdlr)
spinner = self.make_spinner()
spinner.run(self.make_timeout(), lambda: None)
- self.assertItemsEqual(new_hdlrs, list(map(signal.getsignal, signals)))
+ self.assertEqual(new_hdlrs, set(map(signal.getsignal, signals)))
def test_timeout(self):
# If the function takes too long to run, we raise a