allow path lookup for pipestream

[libi2ncommon] / test / test_pipestream.cpp

diff --git a/test/test_pipestream.cpp b/test/test_pipestream.cpp
index 181fe23..bf7b068 100644 (file)
--- a/test/test_pipestream.cpp
+++ b/test/test_pipestream.cpp
@@ -24,6 +24,7 @@
  * Copyright 2018 by Intra2net AG
  */
 
+#define BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
@@ -52,7 +53,7 @@ BOOST_AUTO_TEST_SUITE(pipestream)
 
         BOOST_AUTO_TEST_CASE(abspath_zeros_shell_ok_result)
         {
-            ExecResult exres;
+            ExecResult exres = ExecResult ();
             const std::string result =
                     capture_exec (I2n::join_string (zero_bytes_argv, " "),
                                   exres);
@@ -87,7 +88,7 @@ BOOST_AUTO_TEST_SUITE(pipestream)
 
         BOOST_AUTO_TEST_CASE(abspath_zeros_noshell_ok_result)
         {
-            ExecResult exres;
+            ExecResult exres = ExecResult ();
             const std::string result = capture_exec (zero_bytes_argv, exres);
 
             BOOST_CHECK(exres.normal_exit);
@@ -98,37 +99,113 @@ BOOST_AUTO_TEST_SUITE(pipestream)
 
         const char *const bad_command [] = { "/does_not_exist", NULL };
 
-        BOOST_AUTO_TEST_CASE(abspath_zeros_shell_fail)
+        BOOST_AUTO_TEST_CASE(abspath_bad_shell_fail)
         {
             assert (access(bad_command [0], X_OK) != 0);
 
-            ExecResult exres;
+            ExecResult exres = ExecResult ();
+            /*
+             * Note that the next line will make the unit test spew a message
+             * to stderr which cannot be prevented due to the limitations of
+             * popen(3).
+             */
             const std::string result =
                     capture_exec (I2n::join_string (bad_command, " "));
 
             BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
-        BOOST_AUTO_TEST_CASE(abspath_zeros_noshell_fail)
+        BOOST_AUTO_TEST_CASE(abspath_bad_noshell_fail)
         {
             assert (access(bad_command [0], X_OK) != 0);
 
-            ExecResult exres;
+            ExecResult exres = ExecResult ();
             const std::string result = capture_exec (bad_command, exres);
 
-            BOOST_CHECK(!exres.normal_exit);
             BOOST_CHECK(!exres.terminated_by_signal);
             BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
-        BOOST_AUTO_TEST_CASE(abspath_zeros_noshell_stderr)
+        BOOST_AUTO_TEST_CASE(abspath_bad_noshell_stderr)
         {
             assert (access(bad_command [0], X_OK) != 0);
 
-            ExecResult exres;
+            ExecResult exres = ExecResult ();
             const std::string result = capture_exec (bad_command, exres, false, true);
 
-            BOOST_CHECK_NE(result.size (), 0);
+            BOOST_CHECK(!exres.terminated_by_signal);
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        const char *const false_argv_abs [] = { "/bin/false", NULL };
+        const char *const true_argv_abs  [] = { "/bin/true" , NULL };
+        const char *const false_argv_rel [] = { "false"     , NULL };
+        const char *const true_argv_rel  [] = { "true"      , NULL };
+
+        BOOST_AUTO_TEST_CASE(abspath_false_noshell_fail_exit)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                capture_exec (false_argv_abs, exres, true, false, false);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_FAILURE);
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        BOOST_AUTO_TEST_CASE(abspath_false_shell_fail_exit)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                    capture_exec (std::string (false_argv_abs [0]), exres);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_FAILURE);
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        BOOST_AUTO_TEST_CASE(relpath_true_noshell_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                capture_exec (true_argv_rel, exres, true, false, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_SUCCESS);
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        BOOST_AUTO_TEST_CASE(relpath_true_noshell_fail)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                capture_exec (true_argv_rel, exres, true, false, false);
+
+            BOOST_CHECK(exres.normal_exit);
+            /* no return code check since we couln't exit */
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        BOOST_AUTO_TEST_CASE(abspath_true_noshell_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                capture_exec (true_argv_abs, exres, true, false, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_SUCCESS);
+            BOOST_CHECK_EQUAL(result.size (), 0);
+        }
+
+        BOOST_AUTO_TEST_CASE(relpath_false_noshell_fail)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string result =
+                capture_exec (false_argv_rel, exres, true, false, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            /* no return code check since we couln't exit */
+            BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
     BOOST_AUTO_TEST_SUITE_END() /* [pipestream->read] */