Merge lp:~cjwatson/storm/fix-py311-tests into lp:storm

[Colin Watson]

Fix tests on Python 3.11.

Tests were failing as follows:

  ======================================================================
  ERROR: test_hook_unhook_emit (storm.tests.event.EventTest.test_hook_unhook_emit)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "storm/tests/mocker.py", line 101, in test_method_wrapper
      result = test_method()
               ^^^^^^^^^^^^^
    File "storm/tests/event.py", line 61, in test_hook_unhook_emit
      self.assertEqual(sorted(called1), [
                       ^^^^^^^^^^^^^^^
  TypeError: '<' not supported between instances of 'Marker' and 'Marker'

This seems to have been prompted by a change to the `list.sort` implementation in Python 3.11 that I somehow failed to notice before, but it's easily fixed by giving `Marker` a few trivial comparison methods.

[lp:~cjwatson/storm/fix-py311-tests]

582. By Colin Watson on 2024-03-03

Fix tests on Python 3.11.

Tests were failing as follows:

  ======================================================================
  ERROR: test_hook_unhook_emit (storm.tests.event.EventTest.test_hook_unhook_emit)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "storm/tests/mocker.py", line 101, in test_method_wrapper
      result = test_method()
               ^^^^^^^^^^^^^
    File "storm/tests/event.py", line 61, in test_hook_unhook_emit
      self.assertEqual(sorted(called1), [
                       ^^^^^^^^^^^^^^^
  TypeError: '<' not supported between instances of 'Marker' and 'Marker'

This seems to have been prompted by a change to the `list.sort`
implementation in Python 3.11 that I somehow failed to notice before,
but it's easily fixed by giving `Marker` a few trivial comparison
methods.

[Guruprasad (lgp171188)]

LGTM 👍

review: Approve

=== modified file 'storm/tests/event.py'
--- storm/tests/event.py	2019-11-21 16:06:52 +0000
+++ storm/tests/event.py	2024-03-03 15:49:10 +0000
@@ -25,7 +25,18 @@
 
 
 class Marker(object):
-    pass
+    def __eq__(self, other):
+        return self is other
+
+    def __lt__(self, other):
+        return False if self is other else NotImplemented
+
+    __gt__ = __lt__
+
+    def __le__(self, other):
+        return True if self is other else NotImplemented
+
+    __ge__ = __le__
 
 marker = Marker()