From 3003f3fa73445986b2e98db6d947f5fd75aa7369 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 4 Mar 2016 15:09:54 +0100
Subject: [PATCH] Fix mistake in the test just added.
---
tests/lib/SimpleSAML/Utils/TimeTest.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/lib/SimpleSAML/Utils/TimeTest.php b/tests/lib/SimpleSAML/Utils/TimeTest.php
index 17cbc6e5a..89dc964f4 100644
--- a/tests/lib/SimpleSAML/Utils/TimeTest.php
+++ b/tests/lib/SimpleSAML/Utils/TimeTest.php
@@ -30,14 +30,15 @@ class TimeTest extends \PHPUnit_Framework_TestCase
public function testInitTimezon()
{
$tz = 'UTC';
- if (@date_default_timezone_get() === 'UTC') { // avoid collisions
+ $os = @date_default_timezone_get();
+ if ($os === 'UTC') { // avoid collisions
$tz = 'Europe/Oslo';
}
// test guessing timezone from the OS
- \SimpleSAML_Configuration::loadFromArray(array('timezone' => 'Europe/Madrid'), '[ARRAY]', 'simplesaml');
+ \SimpleSAML_Configuration::loadFromArray(array('timezone' => null), '[ARRAY]', 'simplesaml');
@Time::initTimezone();
- $this->assertEquals('Europe/Madrid', @date_default_timezone_get());
+ $this->assertEquals($os, @date_default_timezone_get());
// clear initialization
$c = new \ReflectionProperty('\SimpleSAML\Utils\Time', 'tz_initialized');
--
GitLab