From 4086cea56d351ddaf3c16ed556431297276a6e90 Mon Sep 17 00:00:00 2001 From: Dwight Engen Date: Mon, 17 Nov 2014 12:33:38 -0500 Subject: [PATCH] lua: fix return value of attach() method MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add simple test case for attach() method. Add assert for return value from create() method which also returns a boolean. Signed-off-by: Dwight Engen Acked-by: Stéphane Graber --- src/lua-lxc/core.c | 2 +- src/lua-lxc/test/apitest.lua | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lua-lxc/core.c b/src/lua-lxc/core.c index 87341285b..2e073d829 100644 --- a/src/lua-lxc/core.c +++ b/src/lua-lxc/core.c @@ -397,7 +397,7 @@ static int container_attach(lua_State *L) return 1; } - lua_pushboolean(L, !!(c->attach_run_wait(c, NULL, argv[0], (const char**)argv))); + lua_pushboolean(L, !(c->attach_run_wait(c, NULL, argv[0], (const char**)argv))); return 1; } diff --git a/src/lua-lxc/test/apitest.lua b/src/lua-lxc/test/apitest.lua index f299b6ac1..8da4336ff 100755 --- a/src/lua-lxc/test/apitest.lua +++ b/src/lua-lxc/test/apitest.lua @@ -119,7 +119,7 @@ function test_container_create() end end log(0, "%-20s %s", "Creating rootfs using:", optarg["t"]) - container:create(optarg["t"]) + assert(container:create(optarg["t"]) == true) assert(container:defined() == true) assert(container:name() == optarg["n"]) end @@ -206,6 +206,12 @@ function test_container_in_cfglist(should_find) end end +function test_container_attach() + log(0, "Test attach...") + assert(container:running() == true) + assert(container:attach("/bin/ps") == true) +end + function test_container_cgroup() log(0, "Test get/set cgroup items...") @@ -330,6 +336,7 @@ test_config_network(0) test_container_start() test_container_started() +test_container_attach() test_container_cgroup() test_container_cmd() -- 2.47.2