beaker 2.13.0 → 2.14.0

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -430,7 +430,7 @@ describe Beaker do
     it "can exec the get_ip command" do
       host = make_host('name', { :stdout => "192.168.2.130\n" } )
 
-      expect( Beaker::Command ).to receive( :new ).with( "ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1" ).once
+      expect( Beaker::Command ).to receive( :new ).with( "ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1", [], {:prepend_cmds=>nil, :cmdexe=>false} ).once
 
       expect( subject.get_ip( host ) ).to be === "192.168.2.130"
 

data/spec/beaker/host_spec.rb

@@ -230,7 +230,7 @@ module Beaker
 
     describe "executing commands" do
       let(:command) { Beaker::Command.new('ls') }
-      let(:host) { Beaker::Host.create('host', make_host_opts('host', options.merge(platform))) }
+      let(:host) { Beaker::Host.create('host', {}, make_host_opts('host', options.merge(platform))) }
       let(:result) { Beaker::Result.new(host, 'ls') }
 
       before :each do
@@ -572,13 +572,13 @@ module Beaker
 
         rsync_args = [ 'source', 'target', ['-az', "-e \"ssh -i #{key} -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"] ]
 
-        expect( host ).to receive(:to_s).and_return('host.example.org')
+        expect( host ).to receive(:reachable_name).and_return('default.ip.address')
 
         expect( Rsync ).to receive(:run).with( *rsync_args ).and_return(Beaker::Result.new(host, 'output!'))
 
         host.do_rsync_to *args
 
-        expect(Rsync.host).to eq('root@host.example.org')
+        expect(Rsync.host).to eq('root@default.ip.address')
       end
 
       it 'throws an IOError when the file given doesn\'t exist' do
@@ -590,56 +590,5 @@ module Beaker
       expect( "#{host}" ).to be === 'name'
     end
 
-    context 'merging defaults' do
-      it 'knows the difference between foss and pe' do
-        @options = { :type => 'pe' }
-        expect( host['puppetpath'] ).to be === '/etc/puppetlabs/puppet'
-      end
-
-    end
-
-    context 'deprecating host keys' do
-
-      describe '#build_deprecated_keys' do
-
-        it 'returns the correct array for a unix host' do
-          expect( host.build_deprecated_keys().include?(:puppetvardir) ).to be_truthy
-        end
-
-        it 'returns the correct array for a windows host' do
-          @platform = 'windows-xp-me-bla'
-          expect( host.build_deprecated_keys().include?(:hieraconf) ).to be_truthy
-        end
-
-        it 'can be called on an unsupported host type without an error being thrown' do
-          @options = { :is_cygwin => false }
-          @platform = 'windows-stuff-stuff'
-          expect{ host.build_deprecated_keys() }.not_to raise_error
-          expect( host.build_deprecated_keys().empty? ).to be_truthy
-        end
-
-        it 'returns an empty array for unsupported host types' do
-          @options = { :is_cygwin => false }
-          @platform = 'windows-stuff-stuff'
-          expect( host.build_deprecated_keys().empty? ).to be_truthy
-        end
-
-      end
-
-      describe '#[]' do
-
-        it 'does not log for a key that isn\'t deprecated' do
-          expect( host ).to receive( :@logger ).exactly(0).times
-          host['puppetbindir']
-        end
-
-        it 'logs the warning message for a deprecated key' do
-          expect( host.instance_variable_get(:@logger) ).to receive( :warn ).once
-          host['hierapuppetlibdir']
-        end
-
-      end
-
-    end
   end
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -59,6 +59,7 @@ module Beaker
 
     let (:docker) { ::Beaker::Docker.new( hosts, options ) }
     let(:docker_options) { nil }
+    let (:version) { {"ApiVersion"=>"1.18", "Arch"=>"amd64", "GitCommit"=>"4749651", "GoVersion"=>"go1.4.2", "KernelVersion"=>"3.16.0-37-generic", "Os"=>"linux", "Version"=>"1.6.0"} }
 
     before :each do
       # Stub out all of the docker-api gem. we should never really call it
@@ -67,6 +68,7 @@ module Beaker
       allow( ::Docker ).to receive(:options).and_return(docker_options)
       allow( ::Docker ).to receive(:options=)
       allow( ::Docker ).to receive(:logger=)
+      allow( ::Docker ).to receive(:version).and_return(version)
       allow( ::Docker::Image ).to receive(:build).and_return(image)
       allow( ::Docker::Container ).to receive(:create).and_return(container)
       allow_any_instance_of( ::Docker::Container ).to receive(:start)

data/spec/beaker/hypervisor/vmpooler_spec.rb

@@ -7,13 +7,14 @@ module Beaker
       vms = make_hosts()
       MockVsphereHelper.set_config( fog_file_contents )
       MockVsphereHelper.set_vms( vms )
-     stub_const( "VsphereHelper", MockVsphereHelper )
-     stub_const( "Net", MockNet )
+      stub_const( "VsphereHelper", MockVsphereHelper )
+      stub_const( "Net", MockNet )
       allow( JSON ).to receive( :parse ) do |arg|
         arg
       end
       allow( Socket ).to receive( :getaddrinfo ).and_return( true )
-      allow_any_instance_of( Beaker::Vmpooler ).to receive(:load_credentials).and_return(fog_file_contents)
+      allow_any_instance_of( Beaker::Vmpooler ).to \
+        receive(:load_credentials).and_return(fog_file_contents)
     end
 
     describe '#get_template_url' do
@@ -23,7 +24,7 @@ module Beaker
         uri = vmpooler.get_template_url("http://pooling.com", "template")
         expect( uri ).to be === "http://pooling.com/vm/template"
       end
-      
+
       it 'adds a missing scheme to a given URL' do
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
         uri = vmpooler.get_template_url("pooling.com", "template")
@@ -39,13 +40,11 @@ module Beaker
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
         expect{ vmpooler.get_template_url("pooling.com", "t!e&m*p(l\\a/t e")}.to raise_error ArgumentError
       end
-      
     end
 
     describe "#provision" do
 
-      it 'provisions hosts from the pool' do 
-
+      it 'provisions hosts from the pool' do
         vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
         allow( vmpooler ).to receive( :require ).and_return( true )
         allow( vmpooler ).to receive( :sleep ).and_return( true )
@@ -55,9 +54,7 @@ module Beaker
         hosts.each do | host |
           expect( host['vmhostname'] ).to be === 'pool'
         end
-        
       end
-
     end
 
     describe "#cleanup" do
@@ -78,10 +75,70 @@ module Beaker
           expect( vm.runtime.powerState ).to be === "poweredOn" #handed back to the pool, stays on
         end
       end
+    end
+  end
 
+  describe Vmpooler do
 
+    before :each do
+      vms = make_hosts()
+      MockVsphereHelper.set_config( fog_file_contents )
+      MockVsphereHelper.set_vms( vms )
+      stub_const( "VsphereHelper", MockVsphereHelper )
+      stub_const( "Net", MockNet )
+      allow( JSON ).to receive( :parse ) do |arg|
+        arg
+      end
+      allow( Socket ).to receive( :getaddrinfo ).and_return( true )
     end
 
-  end
+    describe "#load_credentials" do
+
+      it 'continues without credentials when fog file is missing' do
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_raise(Errno::ENOENT.new)
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == {}
+      end
+
+      it 'continues without credentials when fog file is empty' do
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_return(false)
 
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == {}
+      end
+
+      it 'continues without credentials when fog file contains no :default section' do
+        data = { :some => { :other => :data } }
+
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_return(data)
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == { }
+      end
+
+      it 'continues without credentials when fog file :default section has no :vmpooler_token' do
+        data = { :default => { :something_else => "TOKEN" } }
+
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_return(data)
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == { }
+      end
+
+      it 'stores vmpooler token when found in fog file' do
+        data = { :default => { :vmpooler_token => "TOKEN" } }
+
+        allow_any_instance_of( Beaker::Vmpooler ).to \
+          receive(:read_fog_file).and_return(data)
+
+        vmpooler = Beaker::Vmpooler.new( make_hosts, make_opts )
+        expect( vmpooler.credentials ).to be == { :vmpooler_token => "TOKEN" }
+      end
+    end
+  end
 end

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,8 +6,8 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure"]}
-      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :type => "pe",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true}}
+      let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure"]}
+      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file", :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}

data/spec/beaker/options/parser_spec.rb

@@ -167,10 +167,6 @@ module Beaker
           expect{parser.parse_args(args)}.to raise_error(ArgumentError)
         end
 
-        it "ensures that type is one of pe/git" do
-          args = ["-h", hosts_path, "--log-level", "debug", "--type", "unkowns"]
-          expect{parser.parse_args(args)}.to raise_error(ArgumentError)
-        end
       end
 
       context "set_default_host!" do
@@ -215,16 +211,22 @@ module Beaker
 
       describe "normalize_args" do
         let(:hosts) do
-          {
+          Beaker::Options::OptionsHash.new.merge({
             'HOSTS' => {
               :master => {
                 :roles => ["master","agent","arbitrary_role"],
+                :platform => 'el-7-x86_64',
+                :user => 'root',
               },
               :agent => {
                 :roles => ["agent","default","other_abitrary_role"],
+                :platform => 'el-7-x86_64',
+                :user => 'root',
               },
-            }
-          }
+            },
+            'fail_mode' => 'slow',
+            'preserve_hosts' => 'always',
+          })
         end
 
         def fake_hosts_file_for_platform(hosts, platform)
@@ -237,34 +239,43 @@ module Beaker
         end
 
         shared_examples_for(:a_platform_supporting_only_agents) do |platform,type|
-          let(:args) { ["--type", type] }
 
-          it "restricts #{platform} hosts to agent for #{type}" do
+          it "restricts #{platform} hosts to agent" do
+            args = []
             hosts_file = fake_hosts_file_for_platform(hosts, platform)
             args << "--hosts" << hosts_file
             expect { parser.parse_args(args) }.to raise_error(ArgumentError, /#{platform}.*may not have roles 'master', 'dashboard', or 'database'/)
           end
         end
 
-        context "for pe" do
-          it_should_behave_like(:a_platform_supporting_only_agents, 'solaris-version-arch', 'pe')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch', 'pe')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch', 'pe')
+        context "restricts agents" do
+          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch')
+          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch')
         end
 
-        context "for foss" do
-          it_should_behave_like(:a_platform_supporting_only_agents, 'windows-version-arch', 'git')
-          it_should_behave_like(:a_platform_supporting_only_agents, 'el-4-arch', 'git')
-
-          it "allows master role for solaris" do
-            hosts_file = fake_hosts_file_for_platform(hosts, 'solaris-version-arch')
-            args = ["--type", "git", "--hosts", hosts_file]
-            options_hash = parser.parse_args(args)
-            expect(options_hash[:HOSTS][:master][:platform]).to match(/solaris/)
-            expect(options_hash[:HOSTS][:master][:roles]).to include('master')
-            expect(options_hash[:type]).to eq('git')
+        context "ssh user" do
+
+          it 'uses the ssh[:user] if it is provided' do
+            hosts['HOSTS'][:master][:ssh] = { :user => 'hello' }
+            parser.instance_variable_set(:@options, hosts)
+            parser.normalize_args
+            expect( hosts['HOSTS'][:master][:user] ).to be ==  'hello'
+          end
+
+          it 'uses default user if there is an ssh hash, but no ssh[:user]' do
+            hosts['HOSTS'][:master][:ssh] = { :hello => 'hello' }
+            parser.instance_variable_set(:@options, hosts)
+            parser.normalize_args
+            expect( hosts['HOSTS'][:master][:user] ).to be ==  'root'
+          end
+
+          it 'uses default user if no ssh hash' do
+            parser.instance_variable_set(:@options, hosts)
+            parser.normalize_args
+            expect( hosts['HOSTS'][:master][:user] ).to be ==  'root'
           end
         end
+
       end
     end
   end

data/spec/beaker/options/presets_spec.rb

@@ -19,32 +19,6 @@ module Beaker
         expect(presets.presets).to be_instance_of(Beaker::Options::OptionsHash)
       end
 
-      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.format_found_env_vars( {:is_pe => 'true'} )
-            expect( munged[:type] ).to be == 'pe'
-          end
-          it 'env var is set to "yes"' do
-            munged = presets.format_found_env_vars( {:is_pe => 'yes'} )
-            expect( munged[:type] ).to be == 'pe'
-          end
-        end
-        describe 'sets type to foss if...' do
-          it 'env var is set to "false"' do
-            munged = presets.format_found_env_vars( {:is_pe => 'true'} )
-            expect( munged[:type] ).to be == 'pe'
-          end
-          it 'env var is set to "no"' do
-            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.format_found_env_vars( {:is_pe => nil} )
-          expect( munged[:type] ).to be == nil
-        end
-      end
     end
   end
 end

data/spec/helpers.rb

@@ -50,7 +50,7 @@ module HostHelpers
     opts = Beaker::Options::Presets.new
     opts.presets.merge( opts.env_vars ).merge( { :logger => logger,
                                                :host_config => 'sample.config',
-                                               :type => :foss,
+                                               :type => nil,
                                                :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',
                                                :datastore => 'instance0',
                                                :folder => 'Delivery/Quality Assurance/Staging/Dynamic',
@@ -77,12 +77,12 @@ module HostHelpers
     make_opts.merge( { 'HOSTS' => { name => opts } } ).merge( opts )
   end
 
-  def make_host name, opts
-    opts = HOST_DEFAULTS.merge(opts)
+  def make_host name, host_hash
+    host_hash = Beaker::Options::OptionsHash.new.merge(HOST_DEFAULTS.merge(host_hash))
 
-    host = Beaker::Host.create( name, make_host_opts(name, opts) )
+    host = Beaker::Host.create( name, host_hash, make_opts)
 
-    allow(host).to receive( :exec ).and_return( generate_result( name, opts ) )
+    allow(host).to receive( :exec ).and_return( generate_result( name, host_hash ) )
     host
   end
 

data/spec/mocks.rb

@@ -77,8 +77,7 @@ module FakeHost
 
   def self.create(name = 'fakevm', platform = 'redhat-version-arch', options = {})
     options_hash = Beaker::Options::OptionsHash.new.merge(options)
-    options_hash['HOSTS'] = { name => { 'platform' => Beaker::Platform.new(platform) } }
-    host = Beaker::Host.create(name, options_hash)
+    host = Beaker::Host.create(name, { 'platform' => Beaker::Platform.new(platform) } , options_hash)
     host.extend(MockedExec)
     host
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -411,8 +411,12 @@ files:
 - lib/beaker/dsl/helpers/tk_helpers.rb
 - lib/beaker/dsl/helpers/web_helpers.rb
 - lib/beaker/dsl/install_utils.rb
+- lib/beaker/dsl/install_utils/aio_defaults.rb
 - lib/beaker/dsl/install_utils/ezbake_utils.rb
+- lib/beaker/dsl/install_utils/foss_defaults.rb
+- lib/beaker/dsl/install_utils/foss_utils.rb
 - lib/beaker/dsl/install_utils/module_utils.rb
+- lib/beaker/dsl/install_utils/pe_defaults.rb
 - lib/beaker/dsl/install_utils/pe_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
 - lib/beaker/dsl/outcomes.rb
@@ -510,9 +514,9 @@ files:
 - spec/beaker/dsl/helpers/test_helpers_spec.rb
 - spec/beaker/dsl/helpers/tk_helpers_spec.rb
 - spec/beaker/dsl/helpers/web_helpers_spec.rb
+- spec/beaker/dsl/install_utils/foss_utils_spec.rb
 - spec/beaker/dsl/install_utils/module_utils_spec.rb
 - spec/beaker/dsl/install_utils/pe_utils_spec.rb
-- spec/beaker/dsl/install_utils/puppet_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb