From b155c616b8cbd3ea8080bd7d177a31d79be95319 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 23 Oct 2017 15:27:23 +0200 Subject: [PATCH] Turn on some debugging to try to figure out what goes wrong on Travis --- calendar/inc/class.calendar_bo.inc.php | 4 ++++ calendar/tests/TimezoneTest.php | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 76b8243bf5..ac90ececc6 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1128,6 +1128,10 @@ class calendar_bo unset($event['recur_exception']); // loop over all recurrences and insert them, if they are after $start $rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo + $rrule->rewind(); + error_log(__METHOD__ . ' rrule: ' . $rrule . ' current: ' . $rrule->current()); + foreach($rrule as $time) {error_log($time);}; + $rrule->rewind(); foreach($rrule as $time) { $time->setUser(); // $time is in timezone of event, convert it to usertime used here diff --git a/calendar/tests/TimezoneTest.php b/calendar/tests/TimezoneTest.php index 9494ffc1c6..85a82461c5 100644 --- a/calendar/tests/TimezoneTest.php +++ b/calendar/tests/TimezoneTest.php @@ -297,7 +297,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest { } } while ($event_index < count($tz_list)); - /* one specific test + /* one specific test */ $tz_combos = array(array( 'client' => 'Europe/Berlin', 'server' => 'Pacific/Tahiti', @@ -316,6 +316,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest { */ protected function makeEvent($timezones, $times, $whole_day = false) { + error_log($this->tzString($timezones)); $event = array( 'title' => ($whole_day ? 'Whole day ' : '')."Test for " . $this->tzString($timezones), 'description' => ($whole_day ? 'Whole day ' : '').'Test for test ' . $this->getName() . ' ' . $this->tzString($timezones),