glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

#157: small refactoring, updated specs

Browse source
This commit is contained in:
Vokhmin Alexey V 2013-10-12 02:15:12 +04:00
parent c5a89a54ce
commit 39515cc1da
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/vagrant-lxc/sudo_wrapper.rb
View file

@ -58,13 +58,11 @@ module Vagrant
# Return the output, making sure to replace any Windows-style # Return the output, making sure to replace any Windows-style
# newlines with Unix-style. # newlines with Unix-style.
stdout = r.stdout.gsub("\r\n", "\n")
if opts[:show_stderr] if opts[:show_stderr]
{ { :stdout => stdout, :stderr => r.stderr.gsub("\r\n", "\n") }
:stdout => r.stdout.gsub("\r\n", "\n"),
:stderr => r.stderr.gsub("\r\n", "\n")
}
else else
r.stdout.gsub("\r\n", "\n") stdout
end end
end end

4
spec/unit/driver/cli_spec.rb
View file

@ -146,13 +146,13 @@ describe Vagrant::LXC::Driver::CLI do
end end
it 'supports a "namespaces" parameter' do it 'supports a "namespaces" parameter' do
subject.stub(:run).with(:attach, '-h', '2>&1').and_return('--namespaces') subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => '--namespaces'})
subject.attach *(command + [{namespaces: ['network', 'mount']}]) subject.attach *(command + [{namespaces: ['network', 'mount']}])
subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command) subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
end end
it 'raises a NamespacesNotSupported error if not supported' do it 'raises a NamespacesNotSupported error if not supported' do
subject.stub(:run).with(:attach, '-h', '2>&1').and_return('not supported') subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
expect { expect {
subject.attach *(command + [{namespaces: ['network', 'mount']}]) subject.attach *(command + [{namespaces: ['network', 'mount']}])
}.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported) }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)