On Mon, Feb 17, 2020 at 5:02 PM Hal Murray via devel <devel@ntpsec.org> wrote:
> See issue #642
> https://gitlab.com/NTPsec/ntpsec/issues/642
As handwaved the patch.
From b0b7f7b6016076c7204468cd15888eb1085782b0 Mon Sep 17 00:00:00 2001
From: James Browning <jamesb.f...@gmail.com>
Date: Tue, 18 Feb 2020 10:32:53 -0800
Subject: [PATCH] Bug #642 revise patches from !1084 and try to make everything
work ...
Use odict in the test from 1084 and revise test to reflect that
Disable miguided sorting of mru variables.
---
pylib/packet.py | 2 --
tests/pylib/test_packet.py | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pylib/packet.py b/pylib/packet.py
index 7517a95e4..6ec6a1592 100644
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -1310,8 +1310,6 @@ This combats source address spoofing
mru = None
nonce = None
items = list(variables.items())
- if items:
- items.sort()
for (tag, val) in items:
self.warndbg("tag=%s, val=%s" % (tag, val), 4)
if tag == "nonce":
diff --git a/tests/pylib/test_packet.py b/tests/pylib/test_packet.py
index 00d3fed4d..d6f7848b5 100644
--- a/tests/pylib/test_packet.py
+++ b/tests/pylib/test_packet.py
@@ -1630,11 +1630,11 @@ class TestControlSession(unittest.TestCase):
def test___mru_analyze(self):
# data: nonce, last.older, addr.older, now, last.newest
# addr, last, first, ct, mv, rs
- vars = {"nonce":"noncevalue", "last.older":"FAIL0",
- "addr.older":"FAIL1", "now":"0xcfba1ce0.80000000",
- "last.newest":"FAIL2", "addr.1":"addrtest",
- "last.2":"lasttest", "first.3":"firsttest", "ct.4":"cttest",
- "mv.5":"mvtest", "rs.6":"rstest"}
+ vars = odict((("nonce", "noncevalue"), ("last.older", "FAIL0"),
+ ("addr.older", "FAIL1"), ("now", "0xcfba1ce0.80000000"),
+ ("last.newest", "FAIL2"), ("addr.1", "addrtest"),
+ ("last.2", "lasttest"), ("first.3", "firsttest"), ("ct.4", "cttest"),
+ ("mv.5", "mvtest"), ("rs.6", "rstest")))
cls = self.target()
span = ntpp.MRUList()
nonce = cls._ControlSession__mru_analyze(vars, span, None)
@@ -1652,7 +1652,7 @@ class TestControlSession(unittest.TestCase):
m5.mv = "mvtest"
m6 = ntpp.MRUEntry()
m6.rs = "rstest"
- expected = [m1, m4, m3, m2, m5, m6] # sort order
+ expected = [m1, m2, m3, m4, m5, m6] # sort order
self.assertEqual(len(span.entries), len(expected))
for i in range(len(span.entries)):
self.assertEqual(span.entries[i].addr, expected[i].addr)
--
2.24.1
_______________________________________________
devel mailing list
devel@ntpsec.org
http://lists.ntpsec.org/mailman/listinfo/devel
