summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/run_all_unittests.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-28 15:28:57 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-28 15:28:57 +0000
commitb8f8723b5e2a7da9fdd5e22f4f13c4f0f267624c (patch)
treefca8a1b9378df7da34a2c370af6b5d180f5bf387 /chrome_frame/test/run_all_unittests.cc
parent270961e1c438b1045f9ea6dd131d90f57d41ce44 (diff)
downloadchromium_src-b8f8723b5e2a7da9fdd5e22f4f13c4f0f267624c.zip
chromium_src-b8f8723b5e2a7da9fdd5e22f4f13c4f0f267624c.tar.gz
chromium_src-b8f8723b5e2a7da9fdd5e22f4f13c4f0f267624c.tar.bz2
Reduce flakiness in chrome_frame_tests.exe by having each test run in a clean environment.
This includes: * A TestScrubber runs between all test to kill stray IE and Chrome processes and delete the user data dir. * Refactored CFACWithChrome and ProxyFactoryTest tests to get rid of copy-n-paste. * Tests in ChromeFrameTestWithWebServer that launch Chrome now use a fresh user data dir so as not to collide with a users' existing profile. BUG=81479,114386 TEST=chrome_frame_tests.exe is green on the win_cf trybot Review URL: https://chromiumcodereview.appspot.com/9460019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/run_all_unittests.cc')
-rw-r--r--chrome_frame/test/run_all_unittests.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index de66ba1..defc880 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -13,6 +13,7 @@
#include "chrome_frame/crash_server_init.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/chrome_frame_ui_test_utils.h"
+#include "chrome_frame/test/test_scrubber.h"
#include "chrome_frame/test_utils.h"
#include "chrome_frame/utils.h"
@@ -61,6 +62,8 @@ int main(int argc, char **argv) {
breakpad.reset(InitializeCrashReporting(HEADLESS));
}
+ chrome_frame_test::InstallTestScrubber(testing::UnitTest::GetInstance());
+
int ret = -1;
// If mini_installer is used to register CF, we use the switch
// --no-registration to avoid repetitive registration.