From d4b60271d9b5f3b70d0274d52d611dea52a83e53 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Wed, 24 Oct 2018 14:02:27 +0200
Subject: [PATCH] test: make 'double' tests rely on icmp instead of ntp.

'double' tests have been disabled in aa03833 due to format change
in ntp fields.

Change-Id: Id3ab0a736c164bb7fdfed7b5da8856b512308978
Reviewed-on: https://code.wireshark.org/review/30366
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 test/captures/icmp.pcapng.gz       | Bin 0 -> 313 bytes
 test/suite_dfilter/group_double.py |  43 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 test/captures/icmp.pcapng.gz

diff --git a/test/captures/icmp.pcapng.gz b/test/captures/icmp.pcapng.gz
new file mode 100644
index 0000000000000000000000000000000000000000..653b9e5f57a83ee877ec3c8127040e2bc0a4ab17
GIT binary patch
literal 313
zcmV-90ml9xiwFP!000001LNZ5<!WGHVDPokmSP0b|Dk}HL5IONF<HSsSRq2e&_K^Z
z&sawxsWdYuMZwU>#oR(c!zHn(JTni-(=*mH&}3oIVsI(VEl5r*P%zXpG}JRt&<GCm
zQwT~eQ!ueKGqg}hE6UGR&@U+}&CAwg00WS{AUh+V^#A`13``8n45@jB44gm_HlP>}
ziSA&4ng`O`0<nhS`&|}>V(pm@NkBFTGf4@4IANV&>@9pWf`h@8fgwcgJp+RSWBAVl
zE3`Q|K!9QQ=IhoB41vq9)iSUIKH=cx;^yJy;};MV5*85^6PJ*bl9rK`lUGnwQdUt_
zQ`gYc($>+{(>E|QGBz<aGl$rX?gsgF3*c^m*bZ?C#0?--8jRCkfUF0(gMr~N72E&-
LOoorW-~j*t=YfgZ

literal 0
HcmV?d00001

diff --git a/test/suite_dfilter/group_double.py b/test/suite_dfilter/group_double.py
index c5e8676290..4275a712be 100644
--- a/test/suite_dfilter/group_double.py
+++ b/test/suite_dfilter/group_double.py
@@ -6,63 +6,62 @@ import unittest
 
 from suite_dfilter import dfiltertest
 
-@unittest.skip("Need to find a replacement to NTP for those tests")
 class case_double(dfiltertest.DFTestCase):
 
-    trace_file = "ntp.pcap"
+    trace_file = "icmp.pcapng.gz"
 
     def test_eq_1(self):
-        dfilter = "ntp.rootdelay == 0.0626983642578125"
+        dfilter = "icmp.resptime == 492.204"
         self.assertDFilterCount(dfilter, 1)
 
     def test_eq_2(self):
-        dfilter = "ntp.rootdelay == 0.0626"
+        dfilter = "icmp.resptime == 492.205"
         self.assertDFilterCount(dfilter, 0)
 
     def test_gt_1(self):
-        dfilter = "ntp.rootdelay > 1.0626"
-        self.assertDFilterCount(dfilter, 0)
-
-    def test_gt_2(self):
-        dfilter = "ntp.rootdelay >  0.0626983642578125"
-        self.assertDFilterCount(dfilter, 0)
-
-    def test_gt_3(self):
-        dfilter = "ntp.rootdelay >  0.0026"
+        dfilter = "icmp.resptime > 492"
         self.assertDFilterCount(dfilter, 1)
 
+    def test_gt_2(self):
+        dfilter = "icmp.resptime > 492.203"
+        self.assertDFilterCount(dfilter, 1)
+
+    def test_gt_3(self):
+        dfilter = "icmp.resptime > 493"
+        self.assertDFilterCount(dfilter, 0)
+
     def test_ge_1(self):
-        dfilter = "ntp.rootdelay >= 1.0026"
+        dfilter = "icmp.resptime >= 493"
         self.assertDFilterCount(dfilter, 0)
 
     def test_ge_2(self):
-        dfilter = "ntp.rootdelay >=  0.0626983642578125"
+        dfilter = "icmp.resptime >= 492"
         self.assertDFilterCount(dfilter, 1)
 
     def test_ge_3(self):
-        dfilter = "ntp.rootdelay >=  0.0026"
+        dfilter = "icmp.resptime >= 492.204"
         self.assertDFilterCount(dfilter, 1)
 
     def test_lt_1(self):
-        dfilter = "ntp.rootdelay < 1.0026"
+        dfilter = "icmp.resptime < 493"
         self.assertDFilterCount(dfilter, 1)
 
     def test_lt_2(self):
-        dfilter = "ntp.rootdelay <  0.0626983642578125"
+        dfilter = "icmp.resptime < 492"
         self.assertDFilterCount(dfilter, 0)
 
     def test_lt_3(self):
-        dfilter = "ntp.rootdelay <  0.0026"
+        dfilter = "icmp.resptime < 492.204"
         self.assertDFilterCount(dfilter, 0)
 
     def test_le_1(self):
-        dfilter = "ntp.rootdelay <= 1.0026"
+        dfilter = "icmp.resptime <= 492.204"
         self.assertDFilterCount(dfilter, 1)
 
     def test_le_2(self):
-        dfilter = "ntp.rootdelay <=  0.0626983642578125"
+        dfilter = "icmp.resptime <= 493"
         self.assertDFilterCount(dfilter, 1)
 
     def test_le_3(self):
-        dfilter = "ntp.rootdelay <=  0.0026"
+        dfilter = "icmp.resptime <= 492"
         self.assertDFilterCount(dfilter, 0)