From: Noel Power Date: Wed, 9 May 2018 19:05:36 +0000 (+0100) Subject: python/samba/tests: fix traffic for py2/py3 compatability X-Git-Tag: tdb-1.3.17~1747 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94c982004f8182bcbe8ade897b2128efde28168d;p=thirdparty%2Fsamba.git 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 Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/emulate/traffic.py b/python/samba/tests/emulate/traffic.py index 0cfae02bce0..eb1276b55d1 100644 --- 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)