deac/ruby-lxc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #15 from jkeiser/args

Browse source 
Use default values for #start missing options
This commit is contained in:
Andre Nathan 2014-03-27 14:46:20 -03:00
parent 8593a693ae 645833c77a
commit 198851ebd2
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/lxc/lxc.c
View file

@ -1903,16 +1903,20 @@ container_start(int argc, VALUE *argv, VALUE self)
if (!NIL_P(rb_opts)) { if (!NIL_P(rb_opts)) {
Check_Type(rb_opts, T_HASH); Check_Type(rb_opts, T_HASH);
rb_use_init = rb_hash_aref(rb_opts, SYMBOL("use_init")); rb_use_init = rb_hash_aref(rb_opts, SYMBOL("use_init"));
args.use_init = (rb_use_init != Qnil) && (rb_use_init != Qfalse); if (!NIL_P(rb_use_init))
args.use_init = (rb_use_init != Qfalse);
rb_daemonize = rb_hash_aref(rb_opts, SYMBOL("daemonize")); rb_daemonize = rb_hash_aref(rb_opts, SYMBOL("daemonize"));
args.daemonize = (rb_daemonize != Qnil) && (rb_daemonize != Qfalse); if (!NIL_P(rb_daemonize))
args.daemonize = (rb_daemonize != Qfalse);
rb_close_fds = rb_hash_aref(rb_opts, SYMBOL("close_fds")); rb_close_fds = rb_hash_aref(rb_opts, SYMBOL("close_fds"));
args.close_fds = (rb_close_fds != Qnil) && (rb_close_fds != Qfalse); if (!NIL_P(rb_close_fds))
args.close_fds = (rb_close_fds != Qfalse);
rb_args = rb_hash_aref(rb_opts, SYMBOL("args")); rb_args = rb_hash_aref(rb_opts, SYMBOL("args"));
args.args = NIL_P(rb_args) ? NULL : ruby_to_c_string_array(rb_args); if (!NIL_P(rb_args))
args.args = ruby_to_c_string_array(rb_args);
} }
Data_Get_Struct(self, struct container_data, args.data); Data_Get_Struct(self, struct container_data, args.data);

12
test/test_lxc_created.rb
View file

@ -51,4 +51,16 @@ class TestLXCCreated < Test::Unit::TestCase
rerenamed = renamed.rename(@name) rerenamed = renamed.rename(@name)
assert_equal(@name, rerenamed.name) assert_equal(@name, rerenamed.name)
end end
def test_start
@container.stop if @container.running?
@container.start
assert(@container.running?)
end
def test_start_with_args
@container.stop if @container.running?
@container.start(:close_fds => true)
assert(@container.running?)
end
end end