fix tests for nondeterministic ordering

Author: eviljeff

src/olympia/addons/tests/test_views.py

@@ -2264,6 +2264,9 @@ def test_set_extra_data(self):
         summ_log, name_log = list(
             ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
         )
+        if name_log.arguments[1] != 'name':
+            # The order isn't deterministic, it doesn't matter, so just switch em.
+            name_log, summ_log = summ_log, name_log
         assert name_log.arguments == [self.addon, 'name']
         assert name_log.details == {
             'added': [patch_data['name']['en-US']],
@@ -2574,6 +2577,9 @@ def test_metadata_change_triggers_content_review(self):
         summ_log, name_log = list(
             ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
         )
+        if name_log.arguments[1] != 'name':
+            # The order isn't deterministic, it doesn't matter, so just switch em.
+            name_log, summ_log = summ_log, name_log
         assert name_log.arguments == [self.addon, 'name']
         assert name_log.details == {'added': ['new name'], 'removed': [old_name]}
         assert summ_log.arguments == [self.addon, 'summary']

src/olympia/devhub/tests/test_views_edit.py

@@ -321,22 +321,29 @@ def test_metadata_change_triggers_content_review(self):
         assert str(addon.name) == data['name']
         assert str(addon.summary) == data['summary']
 
-        # check we logged the changes
-        alogs = ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
-        assert alogs.count() == 2
-        name_log, summ_log = list(
-            ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
-        )
-        assert name_log.arguments == [self.addon, 'name']
-        assert name_log.details == {
-            'added': ['new name'],
-            'removed': ['Delicious Bookmarks'],
-        }
-        assert summ_log.arguments == [self.addon, 'summary']
-        assert summ_log.details == {
-            'added': ['new summary'],
-            'removed': ['Delicious Bookmarks is the official'],
-        }
+        if self.listed:
+            # check we logged the changes
+            alogs = ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
+            assert alogs.count() == 2
+            name_log, summ_log = list(
+                ActivityLog.objects.filter(action=amo.LOG.EDIT_ADDON_PROPERTY.id)
+            )
+            if name_log.arguments[1] != 'name':
+                # The order isn't deterministic, it doesn't matter, so just switch em.
+                name_log, summ_log = summ_log, name_log
+            assert name_log.arguments == [self.addon, 'name']
+            assert name_log.details == {
+                'added': ['new name'],
+                'removed': ['Delicious Bookmarks'],
+            }
+            assert summ_log.arguments == [self.addon, 'summary']
+            assert summ_log.details == {
+                'added': ['new summary'],
+                'removed': ['Delicious Bookmarks is the official'],
+            }
+        else:
+            alogs = ActivityLog.objects.filter(action=amo.LOG.EDIT_PROPERTIES.id)
+            assert alogs.count() == 1
 
         # Now repeat, but we won't be changing either name or summary
         alogs.delete()