From 5e5d5a4a7a567891de2082e7f6c173497bb4e84b Mon Sep 17 00:00:00 2001
From: Alexander Turenko <alexander.turenko@tarantool.org>
Date: Fri, 28 Feb 2020 14:51:49 +0300
Subject: [PATCH] Revert "test: unit/popen"
Found another problem with the test:
| /builds/DtQXhC5e/0/tarantool/tarantool/test/unit/popen.c:63:6:
| error: variable 'rc' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
| if (handle == NULL)
| ^~~~~~~~~~~~~~
Decided to revert it and fix in background.
This reverts commit 40a516477aa337b3d15184f99bb1ec1a3095d60a.
---
test/unit/CMakeLists.txt | 3 -
test/unit/popen.c | 253 ---------------------------------------
test/unit/popen.result | 28 -----
3 files changed, 284 deletions(-)
delete mode 100644 test/unit/popen.c
delete mode 100644 test/unit/popen.result
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 4ac08de8db..c037ac5399 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -240,6 +240,3 @@ target_link_libraries(swim_errinj.test unit swim)
add_executable(merger.test merger.test.c)
target_link_libraries(merger.test unit core box)
-
-add_executable(popen.test popen.c)
-target_link_libraries(popen.test misc unit core)
diff --git a/test/unit/popen.c b/test/unit/popen.c
deleted file mode 100644
index f364cee143..0000000000
--- a/test/unit/popen.c
+++ /dev/null
@@ -1,253 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "trivia/util.h"
-#include "unit.h"
-
-#include "coio.h"
-#include "coio_task.h"
-#include "memory.h"
-#include "fiber.h"
-#include "popen.h"
-#include "say.h"
-
-#define TEST_POPEN_COMMON_FLAGS \
- (POPEN_FLAG_SETSID | \
- POPEN_FLAG_SHELL | \
- POPEN_FLAG_RESTORE_SIGNALS)
-
-static int
-wait_exit(struct popen_handle *handle, int *state, int *exit_code)
-{
- for (;;) {
- if (popen_state(handle, state, exit_code))
- return -1;
- if (*state == POPEN_STATE_EXITED ||
- *state == POPEN_STATE_SIGNALED)
- break;
- fiber_sleep(0.1);
- }
- return 0;
-}
-
-static int
-popen_write_exit(void)
-{
- struct popen_handle *handle;
- char *child_argv[] = {
- "/bin/sh", "-c",
- "prompt=''; read -n 5 prompt; echo -n $prompt",
- NULL,
- };
-
- const char data[] = "12345";
- int state, exit_code;
-
- struct popen_opts opts = {
- .argv = child_argv,
- .nr_argv = lengthof(child_argv),
- .env = NULL,
- .flags =
- POPEN_FLAG_FD_STDIN |
- POPEN_FLAG_FD_STDOUT |
- POPEN_FLAG_FD_STDERR |
- TEST_POPEN_COMMON_FLAGS,
- };
- int rc;
-
- plan(7);
- header();
-
- handle = popen_new(&opts);
- ok(handle != NULL, "popen_new");
- if (handle == NULL)
- goto out;
-
- rc = popen_state(handle, &state, &exit_code);
- ok(rc == 0, "popen_state");
-
- ok(state == POPEN_STATE_ALIVE, "state %s",
- popen_state_str(state));
-
- rc = popen_write_timeout(handle, (void *)data,
- (int)strlen(data),
- POPEN_FLAG_FD_STDOUT, 180);
- ok(rc == -1, "write flag check");
-
- rc = popen_write_timeout(handle, (void *)data,
- (int)strlen(data),
- POPEN_FLAG_FD_STDIN, 180);
- diag("write %d bytes '%s'", (int)strlen(data), data);
- ok(rc == (int)strlen(data), "write %s (%d bytes)",
- data, (int)strlen(data));
- if (rc != (int)strlen(data))
- goto out_kill;
-
- rc = wait_exit(handle, &state, &exit_code);
- if (rc) {
- ok(false, "child wait");
- goto out_kill;
- }
-
- ok(state == POPEN_STATE_EXITED, "child exited");
-
-out_kill:
- rc = popen_delete(handle);
- ok(rc == 0, "popen_delete");
-
-out:
- footer();
- return rc | check_plan();
-}
-
-static int
-popen_read_exit(void)
-{
- struct popen_handle *handle;
- char *child_argv[] = {
- "/bin/sh", "-c",
- "echo -n 1 2 3 4 5",
- NULL,
- };
-
- int state, exit_code;
- char data[32] = { };
-
- struct popen_opts opts = {
- .argv = child_argv,
- .nr_argv = lengthof(child_argv),
- .env = NULL,
- .flags =
- POPEN_FLAG_FD_STDIN |
- POPEN_FLAG_FD_STDOUT |
- POPEN_FLAG_FD_STDERR |
- TEST_POPEN_COMMON_FLAGS,
- };
- int rc;
-
- plan(5);
- header();
-
- handle = popen_new(&opts);
- ok(handle != NULL, "popen_new");
- if (handle == NULL)
- goto out;
-
- rc = wait_exit(handle, &state, &exit_code);
- if (rc) {
- ok(false, "child wait");
- goto out_kill;
- }
- ok(state == POPEN_STATE_EXITED, "child exited");
-
- rc = popen_read_timeout(handle, data, sizeof(data),
- POPEN_FLAG_FD_STDIN, 180);
- ok(rc == -1, "read flag check");
-
- rc = popen_read_timeout(handle, data, sizeof(data),
- POPEN_FLAG_FD_STDOUT, 180);
- diag("read %d bytes '%s'\n", rc, data);
- ok(rc == 9 && !strcmp(data, "1 2 3 4 5"),
- "read %s (%d bytes)", data, rc);
-
-out_kill:
- rc = popen_delete(handle);
- ok(rc == 0, "popen_delete");
-
-out:
- footer();
- return rc | check_plan();
-}
-
-static int
-popen_kill(void)
-{
- struct popen_handle *handle;
- char *child_argv[] = {
- "/bin/sh", "-c",
- "while [ 1 ]; do sleep 10; done",
- NULL,
- };
-
- int state, exit_code;
-
- struct popen_opts opts = {
- .argv = child_argv,
- .nr_argv = lengthof(child_argv),
- .env = NULL,
- .flags =
- POPEN_FLAG_FD_STDIN |
- POPEN_FLAG_FD_STDOUT |
- POPEN_FLAG_FD_STDERR |
- TEST_POPEN_COMMON_FLAGS,
- };
- int rc;
-
- plan(4);
- header();
-
- handle = popen_new(&opts);
- ok(handle != NULL, "popen_new");
- if (handle == NULL)
- goto out;
-
- rc = popen_send_signal(handle, SIGTERM);
- ok(rc == 0, "popen_send_signal");
- if (rc != 0)
- goto out_kill;
-
- rc = wait_exit(handle, &state, &exit_code);
- if (rc) {
- ok(false, "child wait");
- goto out_kill;
- }
- ok(state == POPEN_STATE_SIGNALED, "child terminated");
-
-out_kill:
- rc = popen_delete(handle);
- ok(rc == 0, "popen_delete");
-
-out:
- footer();
- return rc | check_plan();
-}
-
-static int
-main_f(va_list ap)
-{
- int rc = 0;
-
- rc |= popen_write_exit();
- rc |= popen_read_exit();
- rc |= popen_kill();
-
- ev_break(loop(), EVBREAK_ALL);
- return 0;
-}
-
-
-int
-main(int argc, char *argv[])
-{
- //say_logger_init(NULL, S_DEBUG, 0, "plain", 0);
- memory_init();
-
- fiber_init(fiber_c_invoke);
- popen_init();
- coio_init();
- coio_enable();
-
- if (!loop())
- panic("%s", "can't init event loop");
-
- struct fiber *test = fiber_new("coio_stat", main_f);
- fiber_wakeup(test);
-
- ev_now_update(loop());
- ev_run(loop(), 0);
- popen_free();
- fiber_free();
- memory_free();
-
- return check_plan();
-}
diff --git a/test/unit/popen.result b/test/unit/popen.result
deleted file mode 100644
index f9ffa008f8..0000000000
--- a/test/unit/popen.result
+++ /dev/null
@@ -1,28 +0,0 @@
-# write 5 bytes '12345'
-# read 9 bytes '1 2 3 4 5'
-
-1..7
- *** popen_write_exit ***
-ok 1 - popen_new
-ok 2 - popen_state
-ok 3 - state alive
-ok 4 - write flag check
-ok 5 - write 12345 (5 bytes)
-ok 6 - child exited
-ok 7 - popen_delete
- *** popen_write_exit: done ***
-1..5
- *** popen_read_exit ***
-ok 1 - popen_new
-ok 2 - child exited
-ok 3 - read flag check
-ok 4 - read 1 2 3 4 5 (9 bytes)
-ok 5 - popen_delete
- *** popen_read_exit: done ***
-1..4
- *** popen_kill ***
-ok 1 - popen_new
-ok 2 - popen_send_signal
-ok 3 - child terminated
-ok 4 - popen_delete
- *** popen_kill: done ***
--
GitLab