diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-10-24 14:02:27 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-10-25 04:09:44 +0000 |
| commit | d4b60271d9b5f3b70d0274d52d611dea52a83e53 (patch) | |
| tree | 5c6c81267880c0013805ee9639009623c5c674d9 /test | |
| parent | b6598d5ec3358d5f3b91dcde7ee36c5ea045459e (diff) | |
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/captures/icmp.pcapng.gz | bin | 0 -> 313 bytes | |||
| -rw-r--r-- | test/suite_dfilter/group_double.py | 37 |
2 files changed, 18 insertions, 19 deletions
diff --git a/test/captures/icmp.pcapng.gz b/test/captures/icmp.pcapng.gz Binary files differnew file mode 100644 index 0000000000..653b9e5f57 --- /dev/null +++ b/test/captures/icmp.pcapng.gz 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) + dfilter = "icmp.resptime > 492" + self.assertDFilterCount(dfilter, 1) def test_gt_2(self): - dfilter = "ntp.rootdelay > 0.0626983642578125" - self.assertDFilterCount(dfilter, 0) + dfilter = "icmp.resptime > 492.203" + self.assertDFilterCount(dfilter, 1) def test_gt_3(self): - dfilter = "ntp.rootdelay > 0.0026" - self.assertDFilterCount(dfilter, 1) + 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) |