From 82f1965b26210f28cb888bc515ed9274bf411069 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Thu, 13 Mar 2014 13:56:05 +0000
Subject: [PATCH] Trying to fix UI tests build for installation & updater
tests.
---
tests/PHPUnit/TestingEnvironment.php | 2 +-
tests/PHPUnit/UI | 2 +-
tests/lib/screenshot-testing/support/test-environment.js | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 2332c068e4..10869303ea 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -77,7 +77,7 @@ class Piwik_TestingEnvironment
public function logVariables()
{
if (isset($_SERVER['QUERY_STRING'])) {
- \Piwik\Log::verbose("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true));
+ \Piwik\Log::info("Test Environment Variables for (%s):\n%s", $_SERVER['QUERY_STRING'], print_r($this->behaviorOverrideProperties, true));
}
}
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index e8040433bf..46a121226d 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit e8040433bffe762401909ff19dadc626f74eae62
+Subproject commit 46a121226d3f83d50692b55f5d2b555b69c13c30
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
index 4fa6aa4105..fbaa34e945 100644
--- a/tests/lib/screenshot-testing/support/test-environment.js
+++ b/tests/lib/screenshot-testing/support/test-environment.js
@@ -91,6 +91,7 @@ TestingEnvironment.prototype._call = function (params, done) {
});
};
+var droppedOnce = false;
TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
console.log(" Setting up fixture " + fixtureClass + "...");
@@ -101,8 +102,11 @@ TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
processArgs.push('--persist-fixture-data');
}
- if (options['drop']) {
+ if (options['drop']
+ && !droppedOnce
+ ) {
processArgs.push('--drop');
+ droppedOnce = true;
}
var child = require('child_process').spawn(config.php, processArgs);
--
GitLab