Merge pull request #12780 from owncloud/make-datetimeformattertest-reliable

Use a fixed timestamp so we dont switch days/years with the getTimestampAgo

tests/lib/datetimeformatter.php

@@ -42,8 +42,7 @@ class DateTimeFormatter extends TestCase {
 	}
 
 	public function formatTimeSpanData() {
-		// use the same time all the time, so the tests are reliable when time would switch
+		$time = 1416916800; // Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
-		$time = time();
 		$deL10N = new \OC_L10N('lib', 'de');
 		return array(
 			array('seconds ago',	$time, $time),
@@ -81,8 +80,7 @@ class DateTimeFormatter extends TestCase {
 	}
 
 	public function formatDateSpanData() {
-		// use the same time all the time, so the tests are reliable when time would switch
+		$time = 1416916800; // Use a fixed timestamp so we dont switch days/years with the getTimestampAgo
-		$time = time();
 		$deL10N = new \OC_L10N('lib', 'de');
 		return array(
 			// Normal testing