redirect unused fds to /dev/null in pipestream

[libi2ncommon] / test / test_pipestream.cpp

diff --git a/test/test_pipestream.cpp b/test/test_pipestream.cpp
index bf7b068..1b4bf8e 100644 (file)
--- a/test/test_pipestream.cpp
+++ b/test/test_pipestream.cpp
@@ -112,6 +112,7 @@ BOOST_AUTO_TEST_SUITE(pipestream)
             const std::string result =
                     capture_exec (I2n::join_string (bad_command, " "));
 
+            BOOST_CHECK(!exres.normal_exit);
             BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
@@ -122,6 +123,7 @@ BOOST_AUTO_TEST_SUITE(pipestream)
             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);
         }
@@ -133,7 +135,9 @@ BOOST_AUTO_TEST_SUITE(pipestream)
             ExecResult exres = ExecResult ();
             const std::string result = capture_exec (bad_command, exres, false, true);
 
+            BOOST_CHECK(exres.normal_exit);
             BOOST_CHECK(!exres.terminated_by_signal);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_FAILURE);
             BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
@@ -208,6 +212,85 @@ BOOST_AUTO_TEST_SUITE(pipestream)
             BOOST_CHECK_EQUAL(result.size (), 0);
         }
 
+        const char *const echo_abs = "/bin/echo";
+        const char *const echo_rel = "echo";
+
+        static std::vector<std::string>
+        mk_echo_argv (const std::string &text, const bool absolute=true)
+        {
+            std::vector<std::string> ret;
+
+            ret.push_back (absolute ? echo_abs : echo_rel);
+            ret.push_back ("-n");
+            ret.push_back (text);
+
+            return ret;
+        }
+
+        BOOST_AUTO_TEST_CASE(abspath_echo_noshell_capture_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string text = "The significant owl hoots in the night.";
+            const std::vector<std::string> argv = mk_echo_argv (text);
+            const std::string result = capture_exec (argv, exres, true, false, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_SUCCESS);
+            BOOST_CHECK_EQUAL(result, text);
+        }
+
+        BOOST_AUTO_TEST_CASE(relpath_echo_noshell_capture_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string text = "Yet many grey lords go sadly to the masterless men.";
+            const std::vector<std::string> argv = mk_echo_argv (text, false);
+            const std::string result = capture_exec (argv, exres, true, false, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_SUCCESS);
+            BOOST_CHECK_EQUAL(result, text);
+        }
+
+        static std::vector<std::string>
+        mk_errcho_argv (const std::string &text)
+        {
+            /*
+             * Hack cause there’s no way to make echo print to stderr without
+             * redirection.
+             */
+            std::vector<std::string> ret;
+
+            ret.push_back ("/bin/sh");
+            ret.push_back ("-c");
+            ret.push_back (std::string ("1>&- 1>&2 echo -n '") + text + "'"); /* brr */
+
+            return ret;
+        }
+
+        BOOST_AUTO_TEST_CASE(sh_errcho_capture_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string text = "Hooray, hooray for the spinster’s sister’s daughter.";
+            const std::vector<std::string> argv = mk_errcho_argv (text);
+            const std::string result = capture_exec (argv, exres, false, true, true);
+
+            BOOST_CHECK(exres.normal_exit);
+            BOOST_CHECK_EQUAL(exres.return_code, EXIT_SUCCESS);
+            BOOST_CHECK_EQUAL(result, text);
+        }
+
+        BOOST_AUTO_TEST_CASE(sh_errcho_stdout_empty_ok)
+        {
+            ExecResult exres = ExecResult ();
+            const std::string text = "To the axeman, all supplicants are the same height.";
+            const std::vector<std::string> argv = mk_errcho_argv (text);
+            const std::string result = capture_exec (argv, 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_SUITE_END() /* [pipestream->read] */
 
 BOOST_AUTO_TEST_SUITE_END() /* [pipestream] */