python/samba/tests: fix traffic for py2/py3 compatability

load/save operations return randomly sorted dictionaries in python3
these changes make sure the already sorted expected results are
compared with sorted actual values.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/emulate/traffic.py b/python/samba/tests/emulate/traffic.py
index 0cfae02bce0ea407634d870e7240c9e249d2cd20..eb1276b55d15cfa09e316ed1d171c5bb68421403 100644 (file)
--- a/python/samba/tests/emulate/traffic.py
+++ b/python/samba/tests/emulate/traffic.py
@@ -93,8 +93,10 @@ class TrafficEmulatorTests(samba.tests.TestCase):
         f.seek(0)
         model2.load(f)
 
-        self.assertEqual(expected_ngrams, model2.ngrams)
-        self.assertEqual(expected_query_details, model2.query_details)
+        ngrams = {k: sorted(v) for k, v in model2.ngrams.items()}
+        details = {k: sorted(v) for k, v in model2.query_details.items()}
+        self.assertEqual(expected_ngrams, ngrams)
+        self.assertEqual(expected_query_details, details)
 
     def test_parse_ngrams(self):
         f = open(TEST_FILE)
@@ -156,5 +158,7 @@ class TrafficEmulatorTests(samba.tests.TestCase):
         f.seek(0)
         model2.load(f)
 
-        self.assertEqual(expected_ngrams, model2.ngrams)
-        self.assertEqual(expected_query_details, model2.query_details)
+        ngrams = {k: sorted(v) for k, v in model2.ngrams.items()}
+        details = {k: sorted(v) for k, v in model2.query_details.items()}
+        self.assertEqual(expected_ngrams, ngrams)
+        self.assertEqual(expected_query_details, details)