X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fintegration%2FTestInstance.cpp;h=71bc194da48ce4ca226d1ad3e7e91f02025cae49;hb=e927325f8b92c0d03c87fed77118f8e55df1b0c9;hp=270c09ca88a2e1ab8920dc50661fc763c0bf8883;hpb=3b617c12da216c2d1744c5fbb62a7ef381e1e0b3;p=blank.git

diff --git a/tst/integration/TestInstance.cpp b/tst/integration/TestInstance.cpp
index 270c09c..71bc194 100644
--- a/tst/integration/TestInstance.cpp
+++ b/tst/integration/TestInstance.cpp
@@ -35,7 +35,6 @@ TestInstance::TestInstance(const Process::Arguments &args, bool cmd)
 , cmd_buf() {
 	if (cmd) {
 		// wait for command service startup
-		// TODO: timeouts for reading from process
 		WaitOutputLine("listening on TCP port 12354");
 		// connect to command service
 		conn = tcp::Socket("localhost", 12354);
@@ -63,7 +62,7 @@ void TestInstance::WriteInput(const string &data) {
 void TestInstance::ReadOutputLine(string &line) {
 	while (!out_buf.Extract(line)) {
 		// buffer exhausted, fetch more data
-		int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain());
+		int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 5000);
 		if (len == 0) {
 			throw runtime_error("failed read from child process' stdout");
 		}
@@ -92,7 +91,7 @@ void TestInstance::WaitOutputLine(const string &expected) {
 void TestInstance::ExhaustOutput(string &output) {
 	while (!out_buf.Extract(output)) {
 		// buffer exhausted, fetch more data
-		int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain());
+		int len = proc.ReadOut(out_buf.WriteHead(), out_buf.Remain(), 5000);
 		if (len == 0) {
 			return;
 		}
@@ -104,7 +103,7 @@ void TestInstance::AssertNoOutput() {
 	string output;
 	ExhaustOutput(output);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"test instanced produced unexpected output",
+		"test instance produced unexpected output",
 		string(""), output);
 }
 
@@ -112,7 +111,7 @@ void TestInstance::AssertNoOutput() {
 void TestInstance::ReadErrorLine(string &line) {
 	while (!err_buf.Extract(line)) {
 		// buffer exhausted, fetch more data
-		int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain());
+		int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 5000);
 		if (len == 0) {
 			throw runtime_error("failed read from child process' stderr");
 		}
@@ -141,7 +140,7 @@ void TestInstance::WaitErrorLine(const string &expected) {
 void TestInstance::ExhaustError(string &error) {
 	while (!err_buf.Extract(error)) {
 		// buffer exhausted, fetch more data
-		int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain());
+		int len = proc.ReadErr(err_buf.WriteHead(), err_buf.Remain(), 5000);
 		if (len == 0) {
 			return;
 		}
@@ -153,7 +152,7 @@ void TestInstance::AssertNoError() {
 	string error;
 	ExhaustError(error);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"test instanced produced unexpected error output",
+		"test instance produced unexpected error output",
 		string(""), error);
 }