[Asterisk-code-review] test_time.c: Tolerate DST transitions (asterisk[master])

[Josh Soref]

Josh Soref has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/17325 )


Change subject: test_time.c: Tolerate DST transitions
......................................................................

test_time.c: Tolerate DST transitions

When test_timezone_watch runs very near a DST transition,
two time zones that would otherwise be expected to report the same
time can differ because of the DST transition.

Instead of having the test fail when this happens, report the
times, time zones, and dst flags.

ASTERISK-29722

Change-Id: Id59bdac8b277e14343ccdf0c99b89e92f79f316a
---
M tests/test_time.c
1 file changed, 6 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/25/17325/1

diff --git a/tests/test_time.c b/tests/test_time.c
index ceb2ae2..7c03381 100644
--- a/tests/test_time.c
+++ b/tests/test_time.c
@@ -91,8 +91,12 @@
 			ast_localtime(&tv, &atm[i], tzfile);
 			if (i != 0) {
 				if (atm[i].tm_hour == atm[i - 1].tm_hour) {
-					res = AST_TEST_FAIL;
-					ast_test_status_update(test, "Failed %s test: %d(%s) = %d(%s)\n", type == 0 ? "deletion" : "symlink", atm[i].tm_hour, zones[i], atm[i-1].tm_hour, zones[i-1]);
+					if (atm[i].tm_isdst == atm[i - 1].tm_isdst) {
+						res = AST_TEST_FAIL;
+						ast_test_status_update(test, "Failed %s test: %d(%s) = %d(%s)\n", type == 0 ? "deletion" : "symlink", atm[i].tm_hour, zones[i], atm[i-1].tm_hour, zones[i-1]);
+					} else {
+						ast_log(LOG_WARNING, "DST transition during %s test: %d(%s/%d) != %d(%s/%d)\n", type == 0 ? "deletion" : "symlink", atm[i].tm_hour, zones[i], atm[i].tm_isdst, atm[i-1].tm_hour, zones[i-1], atm[i-1].tm_isdst);
+					}
 				}
 			}
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/17325
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Id59bdac8b277e14343ccdf0c99b89e92f79f316a
Gerrit-Change-Number: 17325
Gerrit-PatchSet: 1
Gerrit-Owner: Josh Soref <jsoref at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20211107/6f425050/attachment.html>