beaker-vagrant 0.6.7 → 0.7.0

data/spec/beaker/hypervisor/vagrant_libvirt_spec.rb

@@ -6,56 +6,53 @@ describe Beaker::VagrantLibvirt do
                                       'libvirt' => { 'uri' => 'qemu+ssh://root@host/system'},
                                       'vagrant_cpus' => 2,
                                     }) }
-  let( :vagrant ) { Beaker::VagrantLibvirt.new( @hosts, options ) }
-
-  before :each do
-    @hosts = make_hosts()
+  let( :vagrant ) { described_class.new( hosts, options ) }
+  let( :hosts ) do
+    make_hosts().each do |host|
+      host.delete('ip')
+    end
   end
 
   it "uses the vagrant_libvirt provider for provisioning" do
-    @hosts.each do |host|
+    hosts.each do |host|
       host_prev_name = host['user']
       expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
       expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
       expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
-    FakeFS.activate!
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( hosts, options ).once
     expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider libvirt" ).once
-    vagrant.provision
+    FakeFS do
+      vagrant.provision
+    end
   end
 
   context 'Correct vagrant configuration' do
-    before(:each) do
-      FakeFS.activate!
-      path = vagrant.instance_variable_get( :@vagrant_path )
+    subject do
+      FakeFS do
+        vagrant.make_vfile( hosts, options )
+        File.read(vagrant.instance_variable_get(:@vagrant_file))
+      end
+    end
 
-      vagrant.make_vfile( @hosts, options )
-      @vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+    it 'has a provider section' do
+      is_expected.to include( %Q{    v.vm.provider :libvirt do |node|})
     end
 
-    it "can make a Vagranfile for a set of hosts" do
-      expect( @vagrantfile ).to include( %Q{    v.vm.provider :libvirt do |node|})
+    it "has no private network" do
+      is_expected.not_to include('v.vm.network :private_network')
     end
 
     it "can specify the memory as an integer" do
-      expect( @vagrantfile.split("\n").map(&:strip) )
-        .to include('node.memory = 1024')
+      is_expected.to include('node.memory = 1024')
     end
 
     it "can specify the number of cpus" do
-      expect( @vagrantfile.split("\n").map(&:strip) )
-        .to include("node.cpus = 2")
+      is_expected.to include("node.cpus = 2")
     end
 
     it "can specify any libvirt option" do
-      expect( @vagrantfile.split("\n").map(&:strip) )
-        .to include("node.uri = 'qemu+ssh://root@host/system'")
-    end
-
-    it "has a mac address in the proper format" do
-      expect( @vagrantfile.split("\n").map(&:strip) )
-        .to include(/:mac => "08:00:27:\h{2}:\h{2}:\h{2}"/)
+      is_expected.to include("node.uri = 'qemu+ssh://root@host/system'")
     end
   end
 end

data/spec/beaker/hypervisor/vagrant_parallels_spec.rb

@@ -2,43 +2,40 @@ require 'spec_helper'
 
 describe Beaker::VagrantParallels do
   let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
-  let( :vagrant ) { Beaker::VagrantParallels.new( @hosts, options ) }
-
-  before :each do
-    @hosts = make_hosts()
-  end
+  let( :vagrant ) { Beaker::VagrantParallels.new( hosts, options ) }
+  let( :hosts ) { make_hosts }
 
   it "uses the parallels provider for provisioning" do
-    @hosts.each do |host|
+    hosts.each do |host|
       host_prev_name = host['user']
       expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
       expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
       expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
     end
-    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( hosts, options ).once
     expect( vagrant ).to receive( :vagrant_cmd ).with( "up --provider parallels" ).once
     vagrant.provision
   end
 
-  it "can make a Vagranfile for a set of hosts" do
-    path = vagrant.instance_variable_get( :@vagrant_path )
-    allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-
-    vagrant.make_vfile( @hosts )
+  context 'Correct vagrant configuration' do
+    subject do
+      FakeFS do
+        vagrant.make_vfile( hosts, options )
+        File.read(vagrant.instance_variable_get(:@vagrant_file))
+      end
+    end
 
-    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :parallels do |prl|\n      prl.optimize_power_consumption = false\n      prl.memory = '1024'\n    end})
+    it "can make a Vagrantfile for a set of hosts" do
+      is_expected.to include( %Q{    v.vm.provider :parallels do |prl|\n      prl.optimize_power_consumption = false\n      prl.memory = '1024'\n    end})
+    end
   end
 
-  it "can disable the auto-update functionality of the Parallels Guest Tools" do
-    options.merge!({ :prl_update_guest_tools => 'disable' })
-
-    vfile_section = vagrant.class.provider_vfile_section( @hosts.first, options )
-
-    match = vfile_section.match(/prl.update_guest_tools = false/)
-
-    expect( match ).to_not be nil
+  context 'disabled guest tools' do
+    let(:options) { super().merge({ :prl_update_guest_tools => 'disable' }) }
+    subject { vagrant.class.provider_vfile_section( hosts.first, options ) }
 
+    it "can disable the auto-update functionality of the Parallels Guest Tools" do
+      is_expected.to match(/prl.update_guest_tools = false/)
+    end
   end
-
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -30,7 +30,6 @@ module Beaker
     end
 
     it "stores the vagrant file in $WORKINGDIR/.vagrant/beaker_vagrant_files/beaker_sample.cfg" do
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
       path = vagrant.instance_variable_get( :@vagrant_path )
 
       expect( path ).to be === File.join(Dir.pwd, '.vagrant', 'beaker_vagrant_files', 'beaker_sample.cfg')
@@ -39,7 +38,6 @@ module Beaker
 
     it "can make a Vagrantfile for a set of hosts" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       vagrant.make_vfile( @hosts )
 
@@ -53,7 +51,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm2vm1_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm1'
     v.vm.box_check_update = 'true'
-    v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"
     v.vm.synced_folder './', '/temp', create: true
     v.vm.synced_folder '../', '/tmp', create: true
     v.vm.network :forwarded_port, guest: 80, host: 10080
@@ -68,7 +66,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm2vm2_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm2'
     v.vm.box_check_update = 'true'
-    v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0"
     v.vm.synced_folder './', '/temp', create: true
     v.vm.synced_folder '../', '/tmp', create: true
     v.vm.network :forwarded_port, guest: 80, host: 10080
@@ -83,7 +81,7 @@ Vagrant.configure("2") do |c|
     v.vm.box = 'vm2vm3_of_my_box'
     v.vm.box_url = 'http://address.for.my.box.vm3'
     v.vm.box_check_update = 'true'
-    v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0"
     v.vm.synced_folder './', '/temp', create: true
     v.vm.synced_folder '../', '/tmp', create: true
     v.vm.network :forwarded_port, guest: 80, host: 10080
@@ -99,7 +97,6 @@ EOF
 
     it "can make a Vagrantfile with ssh agent forwarding enabled" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       hosts = make_hosts({},1)
       vagrant.make_vfile( hosts, options )
@@ -110,7 +107,6 @@ EOF
 
     it "can replace underscores in host.name with hypens" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       host = make_host( 'name-with_underscore', {} )
       vagrant.make_vfile( [host,], options )
@@ -122,7 +118,6 @@ EOF
 
     it "can make a Vagrantfile with synced_folder disabled" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       hosts = make_hosts({:synced_folder => 'disabled'},1)
       vagrant.make_vfile( hosts, options )
@@ -131,16 +126,6 @@ EOF
       expect( vagrantfile ).to match(/v.vm.synced_folder .* disabled: true/)
     end
 
-    it "can make a Vagrantfile with network mac autogenerated" do
-      path = vagrant.instance_variable_get( :@vagrant_path )
-
-      hosts = make_hosts({},1)
-      vagrant.make_vfile( hosts, options )
-
-      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
-      expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => ".+/)
-    end
-
     it "can make a Vagrantfile with network mac specified" do
       path = vagrant.instance_variable_get( :@vagrant_path )
 
@@ -151,16 +136,6 @@ EOF
       expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "b6:33:ae:19:48:f9/)
     end
 
-    it "can make a Vagrantfile with network mac disabled" do
-      path = vagrant.instance_variable_get( :@vagrant_path )
-
-      hosts = make_hosts({:network_mac => 'false'},1)
-      vagrant.make_vfile( hosts, options )
-
-      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
-      expect( vagrantfile ).to match(/v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"/)
-    end
-
     it "can make a Vagrantfile with improper keys for synced folders" do
       path = vagrant.instance_variable_get( :@vagrant_path )
 
@@ -182,7 +157,6 @@ EOF
 
     it "can make a Vagrantfile with optional shell provisioner" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       shell_path = '/path/to/shell/script'
       hosts = make_hosts({
@@ -198,7 +172,6 @@ EOF
 
     it "can make a Vagrantfile with optional shell provisioner with args" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       shell_path = '/path/to/shell/script.sh'
       shell_args = 'arg1 arg2'
@@ -216,7 +189,6 @@ EOF
 
     it "raises an error if path is not set on shell_provisioner" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       hosts = make_hosts({:shell_provisioner => {}}, 1)
       expect{ vagrant.make_vfile( hosts, options ) }.to raise_error RuntimeError, /No path defined for shell_provisioner or path empty/
@@ -224,7 +196,6 @@ EOF
 
     it "raises an error if path is EMPTY on shell_provisioner" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       empty_shell_path = ''
       hosts = make_hosts({
@@ -238,7 +209,6 @@ EOF
     context "when generating a windows config" do
       before do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
         @hosts[0][:platform] = 'windows'
 
         vagrant.make_vfile( @hosts )
@@ -270,7 +240,6 @@ EOF
     context 'when generating a freebsd config' do
       before do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
         @hosts[0][:platform] = 'freebsd'
 
         vagrant.make_vfile( @hosts )
@@ -285,15 +254,10 @@ EOF
       it 'has the proper guest setting' do
         expect( @generated_file ).to match /v.vm.guest = :freebsd\n/
       end
-
-      it 'sets the vm.base_mac setting' do
-        expect( @generated_file ).to match /v.vm.base_mac = '0123456789'\n/
-      end
     end
 
     it "uses the memsize defined per vagrant host" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       vagrant.make_vfile( @hosts, {'vagrant_memsize' => 'hello!'} )
 
@@ -307,7 +271,6 @@ EOF
 
     it "uses the cpus defined per vagrant host" do
       path = vagrant.instance_variable_get( :@vagrant_path )
-      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
       vagrant.make_vfile( @hosts, {'vagrant_cpus' => 'goodbye!'} )
 
@@ -322,7 +285,6 @@ EOF
     context "port forwarding rules" do
       it "supports all Vagrant parameters" do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
         hosts = make_hosts(
           {
@@ -344,7 +306,6 @@ EOF
 
       it "supports supports from_ip" do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
         hosts = make_hosts(
             {
@@ -364,7 +325,6 @@ EOF
 
       it "supports all to_ip" do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
         hosts = make_hosts(
             {
@@ -384,7 +344,6 @@ EOF
 
       it "supports all protocol" do
         path = vagrant.instance_variable_get( :@vagrant_path )
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
 
         hosts = make_hosts(
             {
@@ -451,57 +410,57 @@ EOF
     end
 
     describe "set_ssh_config" do
-      let( :out ) { double( 'stdout' ) }
+      let( :out ) do
+        <<-CONFIG
+        Host #{name}
+          HostName 127.0.0.1
+          User vagrant
+          Port 2222
+          UserKnownHostsFile /dev/null
+          StrictHostKeyChecking no
+          PasswordAuthentication no
+          IdentityFile /home/root/.vagrant.d/insecure_private_key
+          IdentitiesOnly yes
+        CONFIG
+      end
       let( :host ) { @hosts[0] }
       let( :name ) { host.name }
-      let( :file ) { double( 'file' ) }
+      let( :override_options ) { {} }
 
       before :each do
-        allow( Dir ).to receive( :chdir ).and_yield()
-        wait_thr = OpenStruct.new
-        state = double( 'state' )
-        allow( state ).to receive( :success? ).and_return( true )
-        wait_thr.value = state
-
-        allow( Open3 ).to receive( :popen3 ).with( {"RUBYLIB"=>"", "RUBYOPT"=>""}, 'vagrant', 'ssh-config', name ).and_return( [ "", out, "", wait_thr ])
+        # FakeFS is just broken with Tempfile
+        FakeFS.deactivate!
+        Dir.mktmpdir do |dir|
+          vagrant.instance_variable_get(:@options).merge!(override_options)
+          vagrant.instance_variable_set(:@vagrant_path, dir)
+          state = double( 'state' )
+          allow( state ).to receive( :success? ).and_return( true )
+          allow( Open3 ).to receive( :capture3 ).with( {"RUBYLIB"=>"", "RUBYOPT"=>""}, 'vagrant', 'ssh-config', name ).and_return( [ out, "", state ])
 
-        allow( file ).to receive( :path ).and_return( '/path/sshconfig' )
-        allow( file ).to receive( :rewind ).and_return( true )
+          vagrant.set_ssh_config( host, 'root' )
+        end
+      end
 
-        allow( out ).to receive( :read ).and_return("Host #{name}
-        HostName 127.0.0.1
-        User vagrant
-        Port 2222
-        UserKnownHostsFile /dev/null
-        StrictHostKeyChecking no
-        PasswordAuthentication no
-        IdentityFile /home/root/.vagrant.d/insecure_private_key
-        IdentitiesOnly yes")
+      it 'sets the user to root' do
+        expect(host['user']).to be === 'root'
       end
 
-      it "can generate a ssh-config file" do
-       expect( Tempfile ).to receive( :new ).with( "#{host.name}").and_return( file )
-        expect( file ).to receive( :write ).with("Host ip.address.for.#{name}\n        HostName 127.0.0.1\n        User root\n        Port 2222\n        UserKnownHostsFile /dev/null\n        StrictHostKeyChecking no\n        PasswordAuthentication no\n        IdentityFile /home/root/.vagrant.d/insecure_private_key\n        IdentitiesOnly no")
+      it 'sets the ssh user to root' do
+        expect(host['ssh']['user']).to be === 'root'
+      end
 
-        vagrant.set_ssh_config( host, 'root' )
-        expect( host[:vagrant_ssh_config] ).to be === '/path/sshconfig'
-        expect( host['ssh'][:config]).to be === false
-        expect( host['user']).to be === 'root'
+      # This is because forward_ssh_agent is true by default
+      it 'sets IdentitiesOnly to no' do
+        expect(host['ssh'][:keys_only]).to be === false
       end
 
       context "when :forward_ssh_agent is false" do
-        it "should not change IdentitiesOnly to no" do
-          options = vagrant.instance_variable_get( :@options )
-          options['forward_ssh_agent'] = false
-          options = vagrant.instance_variable_set( :@options, options )
-
-          expect( Tempfile ).to receive( :new ).with( "#{host.name}").and_return( file )
-          expect( file ).to receive( :write ).with("Host ip.address.for.#{name}\n        HostName 127.0.0.1\n        User root\n        Port 2222\n        UserKnownHostsFile /dev/null\n        StrictHostKeyChecking no\n        PasswordAuthentication no\n        IdentityFile /home/root/.vagrant.d/insecure_private_key\n        IdentitiesOnly yes")
+        let(:override_options) do
+          {forward_ssh_agent: false}
+        end
 
-          vagrant.set_ssh_config( host, 'root' )
-          expect( host[:vagrant_ssh_config] ).to be === '/path/sshconfig'
-          expect( host['ssh'][:config]).to be === false
-          expect( host['user']).to be === 'root'
+        it "should keep IdentitiesOnly to yes" do
+          expect( host['ssh'][:keys_only]).to be === true
         end
       end
     end
@@ -515,17 +474,6 @@ EOF
         end
       end
 
-      it 'calls #get_ip_from_vagrant_file' do
-        vagrant.make_vfile(@hosts)
-
-        @hosts.each do |host|
-          allow(vagrant).to receive(:set_ssh_config).with(host, anything)
-          expect(vagrant).to receive(:get_ip_from_vagrant_file).with(host.name)
-        end
-
-        vagrant.configure
-      end
-
       it 'calls #set_all_ssh_config' do
         vagrant.make_vfile(@hosts)
         expect(vagrant).to receive(:set_all_ssh_config)
@@ -569,31 +517,6 @@ EOF
       end
     end
 
-    describe "get_ip_from_vagrant_file" do
-      before :each do
-        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
-        vagrant.make_vfile( @hosts )
-      end
-
-      it "can find the correct ip for the provided hostname" do
-        @hosts.each do |host|
-          expect( vagrant.get_ip_from_vagrant_file(host.name) ).to be === host[:ip]
-        end
-
-      end
-
-      it "returns nil if it is unable to find an ip" do
-        expect( vagrant.get_ip_from_vagrant_file("unknown") ).to be_nil
-      end
-
-      it "raises an error if no Vagrantfile is present" do
-        File.delete( vagrant.instance_variable_get( :@vagrant_file ) )
-        @hosts.each do |host|
-          expect{ vagrant.get_ip_from_vagrant_file(host.name) }.to raise_error RuntimeError, /No vagrant file found/
-        end
-      end
-    end
-
     describe "provisioning and cleanup" do
 
       before :each do