From 755609c059a6883822985bed8a066a91cd4d9be5 Mon Sep 17 00:00:00 2001 From: NiR- Date: Fri, 6 Jun 2014 10:24:18 +0200 Subject: [PATCH] Fix clear_config method. --- ext/lxc/lxc.c | 2 +- test/test_lxc_created.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ext/lxc/lxc.c b/ext/lxc/lxc.c index 679eb41..d71b7ac 100644 --- a/ext/lxc/lxc.c +++ b/ext/lxc/lxc.c @@ -2121,7 +2121,7 @@ Init_lxc(void) rb_define_method(Container, "add_device_node", container_add_device_node, -1); rb_define_method(Container, "attach", container_attach, -1); - rb_define_method(Container, "clear_config", container_clear_config, -1); + rb_define_method(Container, "clear_config", container_clear_config, 0); rb_define_method(Container, "clear_config_item", container_clear_config_item, 1); rb_define_method(Container, "clone", container_clone, -1); diff --git a/test/test_lxc_created.rb b/test/test_lxc_created.rb index 120e1cf..a49875c 100644 --- a/test/test_lxc_created.rb +++ b/test/test_lxc_created.rb @@ -28,6 +28,7 @@ class TestLXCCreated < Test::Unit::TestCase def test_container_configuration capdrop = @container.config_item('lxc.cap.drop') + assert_instance_of(Array, @container.config_item('lxc.cap.drop')) @container.clear_config_item('lxc.cap.drop') @container.set_config_item('lxc.cap.drop', capdrop[0...-1]) @container.set_config_item('lxc.cap.drop', capdrop[-1]) @@ -40,6 +41,15 @@ class TestLXCCreated < Test::Unit::TestCase assert_match(/^00:16:3e:/, @container.config_item('lxc.network.0.hwaddr')) end + def test_clear_config + assert_not_nil(@container.config_item('lxc.utsname')) + assert(@container.clear_config) + + assert_raise(LXC::Error) do + @container.config_item('lxc.utsname').nil? + end + end + def test_container_mount_points assert_instance_of(Array, @container.config_item('lxc.mount.entry')) end