From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 3 Jan 2019 02:54:37 +0000 (+1300)
Subject: traffic: fix hash non-determinism when loading JSON
X-Git-Tag: tdb-1.3.17~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=273eb3dffbaff02b9cc4246783153e26d68485c5;p=thirdparty%2Fsamba.git

traffic: fix hash non-determinism when loading JSON

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Tim Beale <timbeale@samba.org>
---

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 21c68f3d61b..b6097cdc120 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -1216,6 +1216,7 @@ class TrafficModel(object):
             values = self.ngrams.setdefault(k, [])
             for p, count in v.items():
                 values.extend([str(p)] * count)
+            values.sort()
 
         for k, v in d['query_details'].items():
             values = self.query_details.setdefault(str(k), [])
@@ -1224,6 +1225,7 @@ class TrafficModel(object):
                     values.extend([()] * count)
                 else:
                     values.extend([tuple(str(p).split('\t'))] * count)
+            values.sort()
 
         if 'dns' in d:
             for k, v in d['dns'].items():