diff --git a/tests/PHPUnit/Unit/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php index 5d3e709004d86570a88b6b0369723fab607193b1..850e820591155f8b32e5cdfdee152dec58127dad 100644 --- a/tests/PHPUnit/Unit/AssetManagerTest.php +++ b/tests/PHPUnit/Unit/AssetManagerTest.php @@ -251,7 +251,7 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase { $this->clearDateCache(); - sleep(1.5); + sleep(1); $modificationDate = $this->mergedAsset->getModificationDate(); diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php index 719333ccd9318a24638d6ed7fc4cd7c440fc3a8c..185fa064d3706c66b0e78faad47aec21189dab30 100644 --- a/tests/PHPUnit/Unit/CommonTest.php +++ b/tests/PHPUnit/Unit/CommonTest.php @@ -5,6 +5,8 @@ use Piwik\Filesystem; /** * Piwik - free/libre analytics platform * + * @backupGlobals enabled + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php index 9bfa6847ae367d4b27cffb519a647cecc59827a2..f1faa99b88bf89ec69d66e82ca73ce002aa4d667 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php @@ -181,6 +181,9 @@ class PivotByDimensionTest extends PHPUnit_Framework_TestCase $this->assertTableRowsEquals($expectedRows, $table); } + /** + * @backupGlobals enabled + */ public function test_filter_UsesCorrectSegment_WhenPivotingSegmentedReport() { $this->loadPlugins('Referrers', 'UserCountry', 'CustomVariables'); diff --git a/tests/PHPUnit/Unit/IPTest.php b/tests/PHPUnit/Unit/IPTest.php index f12d37dfed2ef711fcefc98275591bb3ea6e9f92..ebaf8eb0ff2aafe3276528dac051bd16be374d77 100644 --- a/tests/PHPUnit/Unit/IPTest.php +++ b/tests/PHPUnit/Unit/IPTest.php @@ -7,6 +7,8 @@ use Piwik\SettingsServer; /** * Piwik - free/libre analytics platform * + * @backupGlobals enabled + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ diff --git a/tests/PHPUnit/Unit/NonceTest.php b/tests/PHPUnit/Unit/NonceTest.php index 9d0d8ef37db27d36f36679623a45e8d64ad2946e..6a9a90994c3e1e4ba2d272dfbbdf7f2bbd42cb19 100644 --- a/tests/PHPUnit/Unit/NonceTest.php +++ b/tests/PHPUnit/Unit/NonceTest.php @@ -5,6 +5,8 @@ use Piwik\Nonce; /** * Piwik - free/libre analytics platform * + * @backupGlobals enabled + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ diff --git a/tests/PHPUnit/Unit/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php index bbde99278583370c26a084e964164852fd788eea..3c2bafe73eff7c0e3d3afa4cfca4838e9385d49b 100644 --- a/tests/PHPUnit/Unit/UrlTest.php +++ b/tests/PHPUnit/Unit/UrlTest.php @@ -5,6 +5,8 @@ use Piwik\Url; /** * Piwik - free/libre analytics platform * + * @backupGlobals enabled + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */