X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=test%2Fcalendar_event_test.pl;h=abbd74cce8632f0a67595605da87c5c658ceb891;hb=e0f86f250c8647f44d45db0ec23b7b6b0f3c2f43;hp=54162551912f93bd05fc14989f88bd8d239c290b;hpb=a5ffa49fda3a66316cc0b026a18eb64cf5093c25;p=pve-common.git

diff --git a/test/calendar_event_test.pl b/test/calendar_event_test.pl
index 5416255..abbd74c 100755
--- a/test/calendar_event_test.pl
+++ b/test/calendar_event_test.pl
@@ -3,12 +3,17 @@
 use lib '../src';
 use strict;
 use warnings;
+use POSIX ();
 use Data::Dumper;
 use Time::Local;
 use Test::More;
 
 use PVE::CalendarEvent;
 
+# Time tests should run in a controlled setting
+$ENV{TZ} = 'UTC';
+POSIX::tzset();
+
 my $alldays = [0,1,2,3,4,5,6];
 my $tests = [
     [
@@ -157,6 +162,24 @@ my $tests = [
      ' mon 0 0',
      { error => "unable to parse calendar event - unused parts" },
     ],
+    [
+     '0,1,3..5',
+     { h => '*', m => [0,1,3,4,5], dow => $alldays },
+     [
+	[0, 60],
+	[60, 3*60],
+	[5*60, 60*60]
+     ]
+    ],
+    [
+     '2,4:0,1,3..5',
+     { h => [2,4], m => [0,1,3,4,5], dow => $alldays },
+     [
+	[0, 2*60*60],
+	[2*60*60 + 60, 2*60*60 + 3*60],
+	[2*60*60 + 5*60, 4*60*60]
+     ]
+    ],
 ];
 
 foreach my $test (@$tests) {
@@ -165,6 +188,7 @@ foreach my $test (@$tests) {
     my $timespec;
     eval { $timespec = PVE::CalendarEvent::parse_calendar_event($t); };
     my $err = $@;
+    delete $timespec->{utc};
 
     if ($expect->{error}) {
 	chomp $err if $err;
@@ -179,11 +203,36 @@ foreach my $test (@$tests) {
 
     foreach my $nt (@$nextsync) {
 	my ($last, $expect_next) = @$nt;
-
 	my $msg = "next event '$t' $last => ${expect_next}";
-	my $next = PVE::CalendarEvent::compute_next_event($timespec, $last, 1);
+	$timespec->{utc} = 1;
+	my $next = PVE::CalendarEvent::compute_next_event($timespec, $last);
 	is($next, $expect_next, $msg);
     }
 };
 
+sub tztest {
+    my ($calspec, $last) = @_;
+    my $spec = PVE::CalendarEvent::parse_calendar_event($calspec);
+    return PVE::CalendarEvent::compute_next_event($spec, $last);
+}
+
+# Test loop termination at CEST/CET switch (cannot happen here in UTC)
+is(tztest('mon..fri', timelocal(0, 0, 0, 28, 9, 2018)),
+                      timelocal(0, 0, 0, 29, 9, 2018));
+is(tztest('mon..fri UTC', timelocal(0, 0, 0, 28, 9, 2018)),
+                          timelocal(0, 0, 0, 29, 9, 2018));
+
+# Now in the affected time zone
+$ENV{TZ} = ':Europe/Vienna';
+POSIX::tzset();
+is(tztest('mon..fri', timelocal(0, 0, 0, 28, 9, 2018)),
+                      timelocal(0, 0, 0, 29, 9, 2018));
+# Specifically requesting UTC in the calendar spec means the resulting output
+# time as seen locally (timelocal() as opposed to timegm()) is shifted by 1
+# hour.
+is(tztest('mon..fri UTC', timelocal(0, 0, 0, 28, 9, 2018)),
+                          timelocal(0, 0, 1, 29, 9, 2018));
+$ENV{TZ} = 'UTC';
+POSIX::tzset();
+
 done_testing();