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

Minor tweaks to specs introduced by GH-329

Browse source
This commit is contained in:
Fabio Rehm 2015-01-11 21:16:30 -02:00
parent 555499d04a
commit f4b738ebd9
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
spec/unit/driver_spec.rb
View file

@ -176,20 +176,19 @@ describe Vagrant::LXC::Driver do
end end
describe 'folder sharing' do describe 'folder sharing' do
rootfs_path = Pathname('/path/to/rootfs')
let(:shared_folder) { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} } let(:shared_folder) { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} }
let(:ro_rw_folder) { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} } let(:ro_rw_folder) { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} }
let(:with_space_folder) { {guestpath: '/tmp/with space', hostpath: '/path/with space'} } let(:with_space_folder) { {guestpath: '/tmp/with space', hostpath: '/path/with space'} }
let(:folders) { [shared_folder, ro_rw_folder, with_space_folder] } let(:folders) { [shared_folder, ro_rw_folder, with_space_folder] }
let(:expected_guest_path) { "vagrant" } let(:expected_guest_path) { "vagrant" }
let(:sudo_wrapper) { double(Vagrant::LXC::SudoWrapper, run: true) } let(:sudo_wrapper) { double(Vagrant::LXC::SudoWrapper, run: true) }
let(:rootfs_path) { Pathname('/path/to/rootfs') }
subject { described_class.new('name', sudo_wrapper) } subject { described_class.new('name', sudo_wrapper) }
describe "with fixed rootfs" do describe "with fixed rootfs" do
before do before do
subject.stub(rootfs_path: rootfs_path, system: true) subject.stub(rootfs_path: Pathname('/path/to/rootfs'), system: true)
subject.share_folders(folders) subject.share_folders(folders)
end end
@ -220,25 +219,27 @@ describe Vagrant::LXC::Driver do
end end
describe "with directory-based LXC config" do describe "with directory-based LXC config" do
config_string = <<-ENDCONFIG.gsub(/^\s+/, '') let(:config_string) {
# Blah blah comment <<-ENDCONFIG.gsub(/^\s+/, '')
lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 # Blah blah comment
lxc.mount.entry = sysfs sys sysfs defaults 0 0 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
lxc.tty = 4 lxc.mount.entry = sysfs sys sysfs defaults 0 0
lxc.pts = 1024 lxc.tty = 4
lxc.rootfs = #{rootfs_path} lxc.pts = 1024
# VAGRANT-BEGIN lxc.rootfs = #{rootfs_path}
lxc.network.type=veth # VAGRANT-BEGIN
lxc.network.name=eth1 lxc.network.type=veth
# VAGRANT-END lxc.network.name=eth1
ENDCONFIG # VAGRANT-END
ENDCONFIG
}
before do before do
subject { described_class.new('name', sudo_wrapper) } subject { described_class.new('name', sudo_wrapper) }
subject.stub(config_string: config_string) subject.stub(config_string: config_string)
subject.share_folders(folders) subject.share_folders(folders)
end end
it 'adds a mount.entry to its local customizations' do it 'adds a mount.entry to its local customizations' do
expect(subject.customizations).to include [ expect(subject.customizations).to include [
'mount.entry', 'mount.entry',
@ -248,18 +249,20 @@ describe Vagrant::LXC::Driver do
end end
describe "with overlayfs-based LXC config" do describe "with overlayfs-based LXC config" do
config_string = <<-ENDCONFIG.gsub(/^\s+/, '') let(:config_string) {
# Blah blah comment <<-ENDCONFIG.gsub(/^\s+/, '')
lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 # Blah blah comment
lxc.mount.entry = sysfs sys sysfs defaults 0 0 lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
lxc.tty = 4 lxc.mount.entry = sysfs sys sysfs defaults 0 0
lxc.pts = 1024 lxc.tty = 4
lxc.rootfs = overlayfs:/path/to/master/directory:#{rootfs_path} lxc.pts = 1024
# VAGRANT-BEGIN lxc.rootfs = overlayfs:/path/to/master/directory:#{rootfs_path}
lxc.network.type=veth # VAGRANT-BEGIN
lxc.network.name=eth1 lxc.network.type=veth
# VAGRANT-END lxc.network.name=eth1
ENDCONFIG # VAGRANT-END
ENDCONFIG
}
before do before do
subject { described_class.new('name', sudo_wrapper) } subject { described_class.new('name', sudo_wrapper) }