timeouts reading from spawned processes

[blank.git] / tst / integration / ServerTest.cpp

diff --git a/tst/integration/ServerTest.cpp b/tst/integration/ServerTest.cpp
index c5ca60e4f34b12b11c99279abbf030b5fce91b73..8fe7788a6849ce2c5efb861180caa76299c6f9f6 100644 (file)
--- a/tst/integration/ServerTest.cpp
+++ b/tst/integration/ServerTest.cpp
@@ -9,20 +9,20 @@ namespace blank {
 namespace test {
 
 void ServerTest::setUp() {
-
+       instance.reset(new TestInstance({ "--server" }, true));
+       instance->AssertRunning();
 }
 
 void ServerTest::tearDown() {
-
+       std::unique_ptr<TestInstance> inst(std::move(instance));
+       inst->Terminate();
+       inst->AssertExitStatus(0);
+       inst->AssertNoError();
 }
 
 
 void ServerTest::testStartup() {
-       TestInstance server({ "--server" }, true);
-       server.AssertRunning();
-       server.Terminate();
-       server.AssertExitStatus(0);
-       server.AssertNoError();
+       // setUp and testDown do all the tests
 }
 
 }