From 5af545672747202e6e47369062f12c3684c04880 Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Mon, 19 Aug 2013 15:05:12 +0200 Subject: [PATCH] DPL Pipe tests fix [Issue#] N/A [Bug] 2 tests failing [Cause] FlattenConsume function assumes presence of data [Solution] Test fix [Verification] Run: wrt-commons-tests-test --output=text --regexp='ProcessPipe_' Change-Id: I5bc2e9a9cc1e16ecd76eed7002ba0a35babf41ee --- tests/test/test_process_pipe.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test/test_process_pipe.cpp b/tests/test/test_process_pipe.cpp index ffc8a8d..46405f9 100644 --- a/tests/test/test_process_pipe.cpp +++ b/tests/test/test_process_pipe.cpp @@ -58,7 +58,7 @@ RUNNER_TEST(ProcessPipe_echo) npp.Close(); char buffer[100] = ""; - result.FlattenConsume(buffer, 99); + result.FlattenConsume(buffer, std::min(result.Size(), sizeof(buffer))); RUNNER_ASSERT_MSG(strcmp(buffer, "Test echo text\nAnd new line\n") == 0, "Echoed text in not equal"); } @@ -113,7 +113,7 @@ RUNNER_TEST(ProcessPipe_pipeerror_pipe) readAll(npp, result); npp.Close(); char buffer[100] = ""; - result.FlattenConsume(buffer, 99); + result.FlattenConsume(buffer, std::min(result.Size(), sizeof(buffer))); RUNNER_ASSERT_MSG(strcmp(buffer, "ls: cannot access /nonexistingdirectory: No such file or directory\n") == 0, "Ls error text in not equal"); } -- 2.7.4