summaryrefslogtreecommitdiffstats
path: root/net/test/python_utils_unittest.cc
diff options
context:
space:
mode:
authorrsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 20:12:46 +0000
committerrsimha@google.com <rsimha@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-12 20:12:46 +0000
commitf352e796c7634f9ac6482150845896ddb6ffb262 (patch)
treee673f29f36fbdad2b54920546e2de211f79105ee /net/test/python_utils_unittest.cc
parentd148b610cbeac4acc3c0e6c7e513ea443293781b (diff)
downloadchromium_src-f352e796c7634f9ac6482150845896ddb6ffb262.zip
chromium_src-f352e796c7634f9ac6482150845896ddb6ffb262.tar.gz
chromium_src-f352e796c7634f9ac6482150845896ddb6ffb262.tar.bz2
Take 2: Force python test server output to be unbuffered, so it doesn't mix with gtest output
In browser tests that use a local python server, the python output in the test logs sometimes overlaps with gtest output, resulting in gtest falsely detecting passing tests as incomplete. This is a result of python's default use of buffered output, which gets written to the log file out of order. This patch forces the python process for local test servers to use unbuffered mode via the -u switch. This way, by the time gtest is ready to log a passing test, all testserver output is already written to the log file. BUG=147368 TEST= See sync integration test output when it is redirected to a log file, and make sure there are no false negatives. Review URL: https://chromiumcodereview.appspot.com/10907162 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test/python_utils_unittest.cc')
-rw-r--r--net/test/python_utils_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc
index 0114774..f81a440 100644
--- a/net/test/python_utils_unittest.cc
+++ b/net/test/python_utils_unittest.cc
@@ -45,12 +45,11 @@ TEST(PythonUtils, Append) {
}
TEST(PythonUtils, PythonRunTime) {
- FilePath dir;
- EXPECT_TRUE(GetPythonRunTime(&dir));
+ CommandLine cmd_line(CommandLine::NO_PROGRAM);
+ EXPECT_TRUE(GetPythonCommand(&cmd_line));
// Run a python command to print a string and make sure the output is what
// we want.
- CommandLine cmd_line(dir);
cmd_line.AppendArg("-c");
std::string input("PythonUtilsTest");
std::string python_cmd = StringPrintf("print '%s';", input.c_str());