Do not worry about transition to running state when starting a container, this is handled from outside
This commit is contained in:
parent
791a93fe9e
commit
cf73a843d0
2 changed files with 2 additions and 7 deletions
|
@ -78,7 +78,7 @@ module Vagrant
|
|||
prune_customizations
|
||||
write_customizations(customizations + @customizations)
|
||||
|
||||
@cli.transition_to(:running) { |c| c.start(extra) }
|
||||
@cli.start(extra)
|
||||
end
|
||||
|
||||
def forced_halt
|
||||
|
@ -109,7 +109,7 @@ module Vagrant
|
|||
@logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
|
||||
@sudo_wrapper.run('rm', '-f', 'rootfs.tar.gz')
|
||||
@sudo_wrapper.run('tar', '--numeric-owner', '-czf', target_path, 'rootfs')
|
||||
|
||||
|
||||
@logger.info "Changing rootfs tarball owner"
|
||||
|
||||
user_details=Etc.getpwnam(Etc.getlogin)
|
||||
|
|
|
@ -80,7 +80,6 @@ describe Vagrant::LXC::Driver do
|
|||
subject { described_class.new('name', sudo, cli) }
|
||||
|
||||
before do
|
||||
cli.stub(:transition_to).and_yield(cli)
|
||||
subject.customizations << internal_customization
|
||||
subject.start(customizations)
|
||||
end
|
||||
|
@ -92,10 +91,6 @@ describe Vagrant::LXC::Driver do
|
|||
it 'starts container with configured customizations' do
|
||||
cli.should have_received(:start)
|
||||
end
|
||||
|
||||
it 'expects a transition to running state to take place' do
|
||||
cli.should have_received(:transition_to).with(:running)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'halt' do
|
||||
|
|
Loading…
Reference in a new issue