beaker 1.19.1 → 1.20.0

data/spec/beaker/host_spec.rb

@@ -240,7 +240,7 @@ module Beaker
         args = [ 'source', 'target', {} ]
         conn_args = args + [ nil ]
 
-        logger.should_receive(:debug)
+        logger.should_receive(:trace)
         conn.should_receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
 
         host.do_scp_to *args
@@ -272,7 +272,7 @@ module Beaker
           host.instance_variable_set :@connection, conn
           args = [ source_path, target_path, {:ignore => ['tests', 'tests2']} ]
 
-          logger.should_receive(:debug)
+          logger.should_receive(:trace)
           host.should_receive( :mkdir_p ).exactly(0).times
           conn.should_receive(:scp_to).exactly(0).times
 
@@ -288,7 +288,7 @@ module Beaker
 
           Dir.stub( :glob ).and_return( @fileset1 + @fileset2 )
 
-          logger.should_receive(:debug)
+          logger.should_receive(:trace)
           host.should_receive( :mkdir_p ).with("#{target_path}/tests")
           host.should_receive( :mkdir_p ).with("#{target_path}/tests2")
           (@fileset1 + @fileset2).each do |file|
@@ -332,7 +332,7 @@ module Beaker
           host.instance_variable_set :@connection, conn
           args = [ 'tmp', 'target', {:ignore => ['tests', 'tests2']} ]
 
-          logger.should_receive(:debug)
+          logger.should_receive(:trace)
           host.should_receive( :mkdir_p ).exactly(0).times
           conn.should_receive(:scp_to).exactly(0).times
 
@@ -349,7 +349,7 @@ module Beaker
 
           Dir.stub( :glob ).and_return( @fileset1 + @fileset2 )
 
-          logger.should_receive(:debug)
+          logger.should_receive(:trace)
           host.should_receive( :mkdir_p ).with('target/tmp/tests')
           host.should_receive( :mkdir_p ).with('target/tmp/tests2')
           (@fileset1 + @fileset2).each do |file|
@@ -373,7 +373,7 @@ module Beaker
 
           Dir.stub( :glob ).and_return( @fileset1 + @fileset2 )
 
-          logger.should_receive(:debug)
+          logger.should_receive(:trace)
           host.should_receive( :mkdir_p ).with('target/tmp/tests2')
           (@fileset2).each do |file|
             file_args = [ file, File.join('target', file), {:ignore => [exclude_file]} ]

data/spec/beaker/hypervisor/ec2_helper_spec.rb

@@ -13,11 +13,11 @@ describe Beaker::EC2Helper do
     end
 
     it "can set ports for dashboard host" do
-      expect(ec2.amiports(["dashboard"])).to be === [22, 61613, 8139, 443]
+      expect(ec2.amiports(["dashboard"])).to be === [22, 61613, 8139, 443, 4435]
     end
 
     it "can set ports for combined master/database/dashboard host" do
-      expect(ec2.amiports(["dashboard", "master", "database"])).to be === [22, 61613, 8139, 8080, 8081, 8140, 443]
+      expect(ec2.amiports(["dashboard", "master", "database"])).to be === [22, 61613, 8139, 8080, 8081, 8140, 443, 4435]
     end
   end
 end

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -54,6 +54,20 @@ module Beaker
       expect( hypervisor.create( 'vagrant', [], make_opts() ) ).to be === vagrant
     end
 
+    it "creates a vagrant_fusion hypervisor for vagrant vmware fusion hosts" do
+      vagrant = double( 'vagrant_fusion' )
+      vagrant.stub( :provision ).and_return( true )
+      VagrantFusion.should_receive( :new ).once.and_return( vagrant )
+      expect( hypervisor.create( 'vagrant_fusion', [], make_opts() ) ).to be === vagrant
+    end
+
+    it "creates a vagrant_virtualbox hypervisor for vagrant virtualbox hosts" do
+      vagrant = double( 'vagrant_virtualbox' )
+      vagrant.stub( :provision ).and_return( true )
+      VagrantVirtualbox.should_receive( :new ).once.and_return( vagrant )
+      expect( hypervisor.create( 'vagrant_virtualbox', [], make_opts() ) ).to be === vagrant
+    end
+
     it "creates a blimpy hypervisor for blimpy hosts" do
       blimpy = double( 'blimpy' )
       blimpy.stub( :provision ).and_return( true )
@@ -61,6 +75,27 @@ module Beaker
       expect( hypervisor.create( 'blimpy', [], make_opts() ) ).to be === blimpy
     end
 
+    context "#configure" do
+      let( :options ) { make_opts.merge({ 'logger' => double().as_null_object }) }
+      let( :hosts ) { make_hosts( { :platform => 'el-5' } ) }
+      let( :hypervisor ) { Beaker::Hypervisor.new( hosts, options ) }
+
+      context "if :disable_iptables option set false" do
+        it "does not call disable_iptables" do
+          options[:disable_iptables] = false
+          hypervisor.should_receive( :disable_iptables ).never
+          hypervisor.configure
+        end
+      end
+
+      context "if :disable_iptables option set true" do
+        it "calls disable_iptables once" do
+          hypervisor.should_receive( :disable_iptables ).exactly( 1 ).times
+          hypervisor.configure
+        end
+      end
+
+    end
 
   end
 end

data/spec/beaker/hypervisor/vagrant_fusion_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Beaker::VagrantFusion do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantFusion.new( @hosts, options ) }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the vmware_fusion provider for provisioning" do
+    @hosts.each do |host|
+      host_prev_name = host['user']
+      vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
+      vagrant.should_receive( :copy_ssh_to_root ).with( host, options ).once
+      vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
+    end
+    vagrant.should_receive( :hack_etc_hosts ).with( @hosts, options ).once
+    FakeFS.activate!
+    vagrant.should_receive( :vagrant_cmd ).with( "up --provider vmware_fusion" ).once
+    vagrant.provision
+  end
+
+  it "can make a Vagranfile for a set of hosts" do
+    FakeFS.activate!
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    vagrant.stub( :randmac ).and_return( "0123456789" )
+
+    vagrant.make_vfile( @hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :vmware_fusion do |v|\n      v.vmx['memsize'] = '1024'\n    end})
+  end
+end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -25,7 +25,44 @@ module Beaker
 
       vagrant.make_vfile( @hosts )
 
-      expect( File.read( File.expand_path( File.join( path, "Vagrantfile") ) ) ).to be === "Vagrant.configure(\"2\") do |c|\n  c.vm.define 'vm1' do |v|\n    v.vm.hostname = 'vm1'\n    v.vm.box = 'vm1_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm1'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm1\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm2' do |v|\n    v.vm.hostname = 'vm2'\n    v.vm.box = 'vm2_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm2'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm2\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm3' do |v|\n    v.vm.hostname = 'vm3'\n    v.vm.box = 'vm3_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm3'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm3\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.provider :virtualbox do |vb|\n    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n  end\nend\n"
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to be === <<-EOF
+Vagrant.configure("2") do |c|
+  c.vm.define 'vm1' do |v|
+    v.vm.hostname = 'vm1'
+    v.vm.box = 'vm1_of_my_box'
+    v.vm.box_url = 'http://address.for.my.box.vm1'
+    v.vm.box_check_update = 'true'
+    v.vm.base_mac = '0123456789'
+    v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0"
+    v.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', '1024']
+    end
+  end
+  c.vm.define 'vm2' do |v|
+    v.vm.hostname = 'vm2'
+    v.vm.box = 'vm2_of_my_box'
+    v.vm.box_url = 'http://address.for.my.box.vm2'
+    v.vm.box_check_update = 'true'
+    v.vm.base_mac = '0123456789'
+    v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0"
+    v.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', '1024']
+    end
+  end
+  c.vm.define 'vm3' do |v|
+    v.vm.hostname = 'vm3'
+    v.vm.box = 'vm3_of_my_box'
+    v.vm.box_url = 'http://address.for.my.box.vm3'
+    v.vm.box_check_update = 'true'
+    v.vm.base_mac = '0123456789'
+    v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0"
+    v.vm.provider :virtualbox do |vb|
+      vb.customize ['modifyvm', :id, '--memory', '1024']
+    end
+  end
+end
+EOF
     end
 
     it "generates a valid windows config" do
@@ -59,7 +96,7 @@ module Beaker
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/vb.customize \["modifyvm", :id, "--memory", "hello!"\]/)
+      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!'\]/)
 
       expect( match ).to_not be nil
 

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Beaker::VagrantVirtualbox do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantVirtualbox.new( @hosts, options ) }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the virtualbox provider for provisioning" do
+    @hosts.each do |host|
+      host_prev_name = host['user']
+      vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
+      vagrant.should_receive( :copy_ssh_to_root ).with( host, options ).once
+      vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
+    end
+    vagrant.should_receive( :hack_etc_hosts ).with( @hosts, options ).once
+    FakeFS.activate!
+    vagrant.should_receive( :vagrant_cmd ).with( "up --provider virtualbox" ).once
+    vagrant.provision
+  end
+
+  it "can make a Vagranfile for a set of hosts" do
+    FakeFS.activate!
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    vagrant.stub( :randmac ).and_return( "0123456789" )
+
+    vagrant.make_vfile( @hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024']\n    end})
+  end
+end

data/spec/beaker/hypervisor/vagrant_workstation_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Beaker::VagrantWorkstation do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantWorkstation.new( @hosts, options ) }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the vmware_workstation provider for provisioning" do
+    @hosts.each do |host|
+      host_prev_name = host['user']
+      vagrant.should_receive( :set_ssh_config ).with( host, 'vagrant' ).once
+      vagrant.should_receive( :copy_ssh_to_root ).with( host, options ).once
+      vagrant.should_receive( :set_ssh_config ).with( host, host_prev_name ).once
+    end
+    vagrant.should_receive( :hack_etc_hosts ).with( @hosts, options ).once
+    FakeFS.activate!
+    vagrant.should_receive( :vagrant_cmd ).with( "up --provider vmware_workstation" ).once
+    vagrant.provision
+  end
+
+  it "can make a Vagranfile for a set of hosts" do
+    FakeFS.activate!
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    vagrant.stub( :randmac ).and_return( "0123456789" )
+
+    vagrant.make_vfile( @hosts )
+
+    vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :vmware_workstation do |v|\n      v.vmx['memsize'] = '1024'\n    end})
+  end
+end

data/spec/beaker/logger_spec.rb

@@ -72,6 +72,32 @@ module Beaker
         colorized_logger.optionally_color "\e[00;30m", 'my string'
       end
 
+      context 'at trace log_level' do
+        subject( :trace_logger )  { Logger.new( my_io,
+                                              :log_level => 'trace',
+                                              :quiet => true,
+                                              :color => true )
+                                  }
+
+        its( :is_debug? ) { should be_true }
+        its( :is_trace? ) { should be_true }
+        its( :is_warn? )  { should be_true }
+
+        context 'but print' do
+          before do
+            my_io.stub :puts
+            my_io.should_receive( :print ).at_least :twice
+          end
+
+          it( 'warnings' )    { trace_logger.warn 'IMA WARNING!'    }
+          it( 'successes' )   { trace_logger.success 'SUCCESS!'     }
+          it( 'errors' )      { trace_logger.error 'ERROR!'         }
+          it( 'host_output' ) { trace_logger.host_output 'ERROR!'   }
+          it( 'debugs' )      { trace_logger.debug 'DEBUGGING!'     }
+          it( 'traces' )      { trace_logger.trace 'TRACING!'       }
+        end
+      end
+
       context 'at verbose log_level' do
         subject( :verbose_logger )  { Logger.new( my_io,
                                               :log_level => 'verbose',
@@ -79,6 +105,7 @@ module Beaker
                                               :color => true )
                                   }
 
+        its( :is_trace? ) { should be_false }
         its( :is_debug? ) { should be_false }
         its( :is_verbose? ) { should be_true }
         its( :is_warn? )  { should be_true }
@@ -104,6 +131,7 @@ module Beaker
                                               :color => true )
                                   }
 
+        its( :is_trace? ) { should be_false }
         its( :is_debug? ) { should be_true }
         its( :is_warn? )  { should be_true }
 
@@ -129,6 +157,7 @@ module Beaker
                                   }
 
         its( :is_debug? ) { should be_false }
+        its( :is_trace? ) { should be_false }
 
 
         context 'skip' do
@@ -138,6 +167,7 @@ module Beaker
           end
 
           it( 'debugs' )    { info_logger.debug 'NOT DEBUGGING!' }
+          it( 'traces' )    { info_logger.debug 'NOT TRACING!'   }
         end
 
 

data/spec/beaker/options/presets_spec.rb

@@ -4,7 +4,7 @@ module Beaker
   module Options
 
     describe Presets do
-      let(:presets)    { Presets }
+      let(:presets)    { Presets.new }
 
       it "returns an env_vars OptionsHash" do
         expect(presets.env_vars).to be_instance_of(Beaker::Options::OptionsHash)
@@ -22,16 +22,16 @@ module Beaker
       describe 'when setting the type as pe from the environment' do
         describe 'sets type to pe if...' do
           it 'env var is set to "true"' do
-            munged = presets.munge_found_env_vars :is_pe => 'true'
+            munged = presets.format_found_env_vars( {:is_pe => 'true'} )
             expect( munged[:type] ).to be == 'pe'
           end
           it 'env var is set to "yes"' do
-            munged = presets.munge_found_env_vars :is_pe => 'yes'
+            munged = presets.format_found_env_vars( {:is_pe => 'yes'} )
             expect( munged[:type] ).to be == 'pe'
           end
         end
         it 'does not set type otherwise' do
-          munged = presets.munge_found_env_vars :is_pe => 'false'
+          munged = presets.format_found_env_vars( {:is_pe => 'false'} )
           expect( munged[:type] ).to be == nil
         end
       end

data/spec/helpers.rb

@@ -47,7 +47,8 @@ module HostHelpers
   end
 
   def make_opts
-     Beaker::Options::Presets.presets.merge( Beaker::Options::Presets.env_vars ).merge( { :logger => logger,
+    opts = Beaker::Options::Presets.new
+    opts.presets.merge( opts.env_vars ).merge( { :logger => logger,
                                                :host_config => 'sample.config',
                                                :type => :foss,
                                                :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',

data/spec/mocks.rb

@@ -17,7 +17,11 @@ module MockNet
     class Response
       class ResponseHash
         def []key
-          { 'ok' => true, 'hostname' => 'pool' }
+          if key == "domain"
+            nil
+          else
+            { 'ok' => true, 'hostname' => 'pool' }
+          end
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.20.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -433,6 +433,9 @@ files:
 - lib/beaker/hypervisor/openstack.rb
 - lib/beaker/hypervisor/solaris.rb
 - lib/beaker/hypervisor/vagrant.rb
+- lib/beaker/hypervisor/vagrant_fusion.rb
+- lib/beaker/hypervisor/vagrant_virtualbox.rb
+- lib/beaker/hypervisor/vagrant_workstation.rb
 - lib/beaker/hypervisor/vcloud.rb
 - lib/beaker/hypervisor/vcloud_pooled.rb
 - lib/beaker/hypervisor/vsphere.rb
@@ -485,7 +488,10 @@ files:
 - spec/beaker/hypervisor/fusion_spec.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
+- spec/beaker/hypervisor/vagrant_fusion_spec.rb
 - spec/beaker/hypervisor/vagrant_spec.rb
+- spec/beaker/hypervisor/vagrant_virtualbox_spec.rb
+- spec/beaker/hypervisor/vagrant_workstation_spec.rb
 - spec/beaker/hypervisor/vcloud_pooled_spec.rb
 - spec/beaker/hypervisor/vcloud_spec.rb
 - spec/beaker/hypervisor/vsphere_helper_spec.rb
@@ -543,62 +549,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!
-test_files:
-- spec/beaker/answers_spec.rb
-- spec/beaker/cli_spec.rb
-- spec/beaker/command_spec.rb
-- spec/beaker/dsl/assertions_spec.rb
-- spec/beaker/dsl/ezbake_utils_spec.rb
-- spec/beaker/dsl/helpers_spec.rb
-- spec/beaker/dsl/install_utils_spec.rb
-- spec/beaker/dsl/outcomes_spec.rb
-- spec/beaker/dsl/roles_spec.rb
-- spec/beaker/dsl/structure_spec.rb
-- spec/beaker/dsl/wrappers_spec.rb
-- spec/beaker/host/unix/pkg_spec.rb
-- spec/beaker/host/windows/group_spec.rb
-- spec/beaker/host_prebuilt_steps_spec.rb
-- spec/beaker/host_spec.rb
-- spec/beaker/hypervisor/aixer_spec.rb
-- spec/beaker/hypervisor/aws_sdk_spec.rb
-- spec/beaker/hypervisor/blimper_spec.rb
-- spec/beaker/hypervisor/docker_spec.rb
-- spec/beaker/hypervisor/ec2_helper_spec.rb
-- spec/beaker/hypervisor/fusion_spec.rb
-- spec/beaker/hypervisor/hypervisor_spec.rb
-- spec/beaker/hypervisor/solaris_spec.rb
-- spec/beaker/hypervisor/vagrant_spec.rb
-- spec/beaker/hypervisor/vcloud_pooled_spec.rb
-- spec/beaker/hypervisor/vcloud_spec.rb
-- spec/beaker/hypervisor/vsphere_helper_spec.rb
-- spec/beaker/hypervisor/vsphere_spec.rb
-- spec/beaker/logger_spec.rb
-- spec/beaker/options/command_line_parser_spec.rb
-- spec/beaker/options/data/LATEST
-- spec/beaker/options/data/badyaml.cfg
-- spec/beaker/options/data/hosts.cfg
-- spec/beaker/options/data/opts.txt
-- spec/beaker/options/hosts_file_parser_spec.rb
-- spec/beaker/options/options_file_parser_spec.rb
-- spec/beaker/options/options_hash_spec.rb
-- spec/beaker/options/parser_spec.rb
-- spec/beaker/options/pe_version_scaper_spec.rb
-- spec/beaker/options/presets_spec.rb
-- spec/beaker/perf_spec.rb
-- spec/beaker/platform_spec.rb
-- spec/beaker/puppet_command_spec.rb
-- spec/beaker/shared/error_handler_spec.rb
-- spec/beaker/shared/host_manager_spec.rb
-- spec/beaker/shared/repetition_spec.rb
-- spec/beaker/ssh_connection_spec.rb
-- spec/beaker/test_case_spec.rb
-- spec/beaker/test_suite_spec.rb
-- spec/helpers.rb
-- spec/matchers.rb
-- spec/mock_blimpy.rb
-- spec/mock_fission.rb
-- spec/mock_vsphere.rb
-- spec/mock_vsphere_helper.rb
-- spec/mocks.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: