Replace deprecated self.assertItemsEqual with assert.

Author: nzlosh

st2common/tests/unit/test_greenpooldispatch.py

@@ -36,7 +36,7 @@ def test_dispatch_simple(self):
         call_args_list = [
             (args[0][0], args[0][1]) for args in mock_handler.call_args_list
         ]
-        self.assertItemsEqual(expected, call_args_list)
+        assert expected == call_args_list
 
     def test_dispatch_starved(self):
         dispatcher = BufferedDispatcher(
@@ -55,4 +55,4 @@ def test_dispatch_starved(self):
         call_args_list = [
             (args[0][0], args[0][1]) for args in mock_handler.call_args_list
         ]
-        self.assertItemsEqual(expected, call_args_list)
+        assert expected == call_args_list

st2common/tests/unit/test_model_utils_profiling.py

@@ -37,7 +37,7 @@ def test_logging_profiling_is_disabled(self, mock_log):
         result = log_query_and_profile_data_for_queryset(queryset=queryset)
         self.assertEqual(queryset, result)
         call_args_list = mock_log.debug.call_args_list
-        self.assertItemsEqual(call_args_list, [])
+        assert call_args_list == []
 
     @mock.patch("st2common.models.utils.profiling.LOG")
     def test_logging_profiling_is_enabled(self, mock_log):

st2common/tests/unit/test_util_file_system.py

@@ -39,8 +39,13 @@ def test_get_file_list(self):
             "meta/concurrency.yaml",
             "meta/__init__.py",
         ]
-        result = get_file_list(directory=directory, exclude_patterns=["*.pyc"])
-        self.assertItemsEqual(expected, result)
+        result = get_file_list(
+            directory=directory, exclude_patterns=["*.pyc", "__pycache__"]
+        )
+        # directory listings are sorted because the item order must be exact for assert
+        # to validate equivalence.  Directory item order doesn't matter in general and may
+        # even change on different platforms or locales.
+        assert sorted(expected) == sorted(result)
 
         # Custom exclude pattern
         expected = [
@@ -52,4 +57,7 @@ def test_get_file_list(self):
         result = get_file_list(
             directory=directory, exclude_patterns=["*.pyc", "*.yaml", "*BUILD"]
         )
-        self.assertItemsEqual(expected, result)
+        # directory listings are sorted because the item order must be exact for assert
+        # to validate equivalence.  Directory item order doesn't matter in general and may
+        # even change on different platforms or locales.
+        assert sorted(expected) == sorted(result)

st2reactor/tests/unit/test_timer.py

@@ -31,8 +31,9 @@ def test_trigger_types_are_registered_on_start(self):
         timer = St2Timer()
         timer._scheduler = mock.Mock()
 
-        # Verify there are no TriggerType in the db when we start
-        self.assertItemsEqual(TriggerType.get_all(), [])
+        # Verify there are no TriggerType objects in the db when we start
+        # and cast Mongo QuerySet iterator cast to list for evaluation.
+        assert list(TriggerType.get_all()) == []
 
         timer.start()
 
@@ -55,8 +56,8 @@ def test_existing_rules_are_loaded_on_start(self):
         timer._trigger_watcher.run = mock.Mock()
 
         # Verify there are no Trigger and TriggerType in the db wh:w
-        self.assertItemsEqual(Trigger.get_all(), [])
-        self.assertItemsEqual(TriggerType.get_all(), [])
+        assert list(Trigger.get_all()) == []
+        assert list(TriggerType.get_all()) == []
 
         # Add a dummy timer Trigger object
         type_ = list(TIMER_TRIGGER_TYPES.keys())[0]