livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't be confused by "\r\n" line endings on pipe on Windows. 

These are all very well when we just want to dump the output to a log, or
whatever, but in a unit-test context it matters for comparison.
meow-7.2.2
Nat Goodspeed 2012-02-15 20:57:25 -05:00
parent 56d931216e
commit fc6d70db87
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/llcommon/tests/llprocess_test.cpp
View File

@ -288,6 +288,22 @@ public:
LLError::Settings* mOldSettings;
};
std::string getline(std::istream& in)
{
std::string line;
std::getline(in, line);
// Blur the distinction between "\r\n" and plain "\n". std::getline() will
// have eaten the "\n", but we could still end up with a trailing "\r".
std::string::size_type lastpos = line.find_last_not_of("\r");
if (lastpos != std::string::npos)
{
// Found at least one character that's not a trailing '\r'. SKIP OVER
// IT and then erase the rest of the line.
line.erase(lastpos+1);
}
return line;
}
/*****************************************************************************
* TUT
*****************************************************************************/
@ -1010,17 +1026,15 @@ namespace tut
yield();
}
ensure("script never started", i < timeout);
std::string line;
std::getline(childout.get_istream(), line);
ensure_equals("bad wakeup from stdin/stdout script", line, "ok");
ensure_equals("bad wakeup from stdin/stdout script",
getline(childout.get_istream()), "ok");
py.mPy->getWritePipe().get_ostream() << "go" << std::endl;
for (i = 0; i < timeout && py.mPy->isRunning() && ! childout.contains("\n"); ++i)
{
yield();
}
ensure("script never replied", childout.contains("\n"));
std::getline(childout.get_istream(), line);
ensure_equals("child didn't ack", line, "ack");
ensure_equals("child didn't ack", getline(childout.get_istream()), "ack");
ensure_equals("bad child termination", py.mPy->getStatus().mState, LLProcess::EXITED);
ensure_equals("bad child exit code", py.mPy->getStatus().mData, 0);
}