diff options
author | Peter Wu <peter@lekensteyn.nl> | 2019-01-23 19:21:59 +0100 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2019-01-24 09:20:10 +0000 |
commit | a946eb3141ce4942852ae8f3c28c5ebfaa6943bb (patch) | |
tree | e576d2eb4980a2794e23bdc061b9d75776aff28b /test/suite_dfilter/group_time_type.py | |
parent | 044a9deeca90dfe61754c06d623272f87c9e140f (diff) |
ftype-time: parse the month independent of the locale
Do not rely on strptime("%b") to parse the month, it does not correctly
recognize English month abbreviations on non-English systems. While at
it, do not try to parse milliseconds if seconds are missing.
Change-Id: Ia049bf362195eef1eba2f04ff7217049fa6a7d9d
Reviewed-on: https://code.wireshark.org/review/31707
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'test/suite_dfilter/group_time_type.py')
-rw-r--r-- | test/suite_dfilter/group_time_type.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/suite_dfilter/group_time_type.py b/test/suite_dfilter/group_time_type.py index c1e46ab3ef..2447363cfe 100644 --- a/test/suite_dfilter/group_time_type.py +++ b/test/suite_dfilter/group_time_type.py @@ -19,6 +19,10 @@ class case_time(unittest.TestCase): dfilter = 'frame.time == "Jan 31, 2002 13:55:31.3"' checkDFilterCount(dfilter, 0) + def test_eq_3(self, checkDFilterCount): + dfilter = 'frame.time == "2002-12-31 13:55:31.3"' + checkDFilterCount(dfilter, 1) + def test_ne_1(self, checkDFilterCount): dfilter = 'frame.time != "Dec 31, 2002 13:55:31.3"' checkDFilterCount(dfilter, 0) @@ -75,3 +79,17 @@ class case_time(unittest.TestCase): dfilter = 'frame.time <= "Dec 31, 2002 13:56:31.3"' checkDFilterCount(dfilter, 1) + def test_bad_time_1(self, checkDFilterFail): + # No text is permitted after the time. + dfilter = 'frame.time == "Dec 31, 2002 13:56:31.3 UTC"' + checkDFilterFail(dfilter) + + def test_bad_time_2(self, checkDFilterFail): + # Miliseconds can only occur after seconds. + dfilter = 'frame.time == "2002-12-31 13:55.3"' + checkDFilterFail(dfilter) + + def test_bad_time_3(self, checkDFilterFail): + # Reject months in a different locale (mrt is March in nl_NL.UTF-8). + dfilter = 'frame.time == "mrt 1, 2000 00:00:00"' + checkDFilterFail(dfilter) |