diff --git a/scapy/contrib/ppi_geotag.uts b/scapy/contrib/ppi_geotag.uts index 9b1f38dc4b72131d8a7bc08ab657b0880d3908b3..2a986a047b796ff04ac194e4e388e975bb805082 100644 --- a/scapy/contrib/ppi_geotag.uts +++ b/scapy/contrib/ppi_geotag.uts @@ -32,14 +32,24 @@ assert GPSTime_Field("GPSTime", None).delta == 0.0 local_time = time.localtime() utc_time = UTCTimeField("Test", None, epoch=local_time) -assert time.localtime(utc_time.epoch) == time.localtime() -assert time.gmtime(utc_time.delta) == time.localtime() -assert utc_time.i2repr(None, None) == (time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time) + " (" + str(int(utc_time.delta)) + ")") +assert time.localtime(utc_time.epoch) == local_time +assert time.mktime(time.gmtime(utc_time.delta)) == time.mktime(local_time) +strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time) +if local_time.tm_isdst: + # Fix hour in case of summer time + strft_time = re.sub(r"(\d+)(:\d+:\d+)", (str(local_time.tm_hour - 1) + r"\2"), strft_time) + +assert utc_time.i2repr(None, None) == (strft_time + " (" + str(int(utc_time.delta)) + ")") = Test LETimeField with time values local_time = time.localtime() lme_time = LETimeField("Test", None, epoch=local_time) assert time.localtime(lme_time.epoch) == local_time -assert time.gmtime(lme_time.delta) == local_time -assert lme_time.i2repr(None, None) == (time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time) + " (" + str(int(lme_time.delta)) + ")") +assert time.mktime(time.gmtime(lme_time.delta)) == time.mktime(local_time) +strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time) +if local_time.tm_isdst: + # Fix hour in case of summer time + strft_time = re.sub(r"(\d+)(:\d+:\d+)", (str(local_time.tm_hour - 1) + r"\2"), strft_time) + +assert lme_time.i2repr(None, None) == (strft_time + " (" + str(int(lme_time.delta)) + ")")