Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-09-22 11:00:12 +0300
committerdiosmosis <benaka@piwik.pro>2015-10-27 07:46:24 +0300
commitac4245ff272f9d7e6f0804db6abe6b53eeff36a9 (patch)
tree7c013373597d3f68aa11f001ce25a92ea2ddc856 /tests/PHPUnit/Framework
parent2a03a34377700cafae65f765f0d2ff0af845494d (diff)
Add port in tests to tracker URL.
Diffstat (limited to 'tests/PHPUnit/Framework')
-rw-r--r--tests/PHPUnit/Framework/Fixture.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 8890d12766..da83196a5e 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -468,11 +468,16 @@ class Fixture extends \PHPUnit_Framework_Assert
{
$piwikUrl = Config::getInstance()->tests['http_host'];
$piwikUri = Config::getInstance()->tests['request_uri'];
+ $piwikPort = Config::getInstance()->tests['port'];
if($piwikUri == '@REQUEST_URI@') {
throw new Exception("Piwik is mis-configured. Remove (or fix) the 'request_uri' entry below [tests] section in your config.ini.php. ");
}
+ if (!empty($piwikPort)) {
+ $piwikUrl = $piwikUrl . ':' . $piwikPort;
+ }
+
if (strpos($piwikUrl, 'http://') !== 0) {
$piwikUrl = 'http://' . $piwikUrl . '/';
}
@@ -523,7 +528,6 @@ class Fixture extends \PHPUnit_Framework_Assert
*/
public static function getTracker($idSite, $dateTime, $defaultInit = true, $useLocal = false)
{
- echo "Found tracker URL to be: " . self::getTrackerUrl() . "\n";
if ($useLocal) {
require_once PIWIK_INCLUDE_PATH . '/tests/LocalTracker.php';
$t = new Piwik_LocalTracker($idSite, self::getTrackerUrl());