Revert "refactor: modify tests so they pass in newer versions"

This reverts commit 14e015a.

openedx_events/tests/test_producer_config.py

@@ -42,16 +42,18 @@ def test_enabled_disabled_events(self, mock_producer):
         XBLOCK_PUBLISHED.send_event(xblock_info=self.xblock_info)
         mock_send.send.assert_called()
         mock_send.send.call_count = 2
-        expected_call_args = [
-            {'topic': 'enabled_topic_a', 'event_key_field': 'xblock_info.usage_key'},
-            {'topic': 'enabled_topic_b', 'event_key_field': 'xblock_info.usage_key'}
-        ]
 
         # check that call_args_list only consists of enabled topics.
         call_args = mock_send.send.call_args_list[0][1]
-        self.assertEqual(call_args, call_args | expected_call_args[0])
+        self.assertDictContainsSubset(
+            {'topic': 'enabled_topic_a', 'event_key_field': 'xblock_info.usage_key'},
+            call_args
+        )
         call_args = mock_send.send.call_args_list[1][1]
-        self.assertEqual(call_args, call_args | expected_call_args[1])
+        self.assertDictContainsSubset(
+            {'topic': 'enabled_topic_b', 'event_key_field': 'xblock_info.usage_key'},
+            call_args
+        )
 
     @patch("openedx_events.apps.logger")
     @patch('openedx_events.apps.get_producer')

openedx_events/tests/test_tooling.py

@@ -111,9 +111,8 @@ def test_generate_signal_metadata(self, datetime_mock, socket_mock, events_packa
         }
 
         metadata = self.public_signal.generate_signal_metadata()
-        metadata_as_dict = attr.asdict(metadata)
 
-        self.assertEqual(metadata_as_dict, expected_metadata | metadata_as_dict)
+        self.assertDictContainsSubset(expected_metadata, attr.asdict(metadata))
         self.assertIsInstance(metadata.id, UUID)
 
     @override_settings(SERVICE_VARIANT="lms")
@@ -139,9 +138,8 @@ def test_generate_signal_metadata_with_valid_time(self, socket_mock, events_pack
         }
 
         metadata = self.public_signal.generate_signal_metadata(time=expected_time)
-        metadata_as_dict = attr.asdict(metadata)
 
-        self.assertEqual(metadata_as_dict, expected_metadata | metadata_as_dict)
+        self.assertDictContainsSubset(expected_metadata, attr.asdict(metadata))
         self.assertIsInstance(metadata.id, UUID)
 
     @ddt.data(