beaker 2.7.1 → 2.8.0

data/spec/beaker/dsl/structure_spec.rb

@@ -84,4 +84,112 @@ describe ClassMixedWithDSLStructure do
       expect{ subject.expect_failure 'this has no failure', &block }.to raise_error(RuntimeError, /An assertion was expected to fail, but passed/)
     end
   end
+
+  describe 'confine' do
+    let(:logger) { double.as_null_object }
+    before do
+      allow( subject ).to receive( :logger ).and_return( logger )
+    end
+
+    it 'skips the test if there are no applicable hosts' do
+      allow( subject ).to receive( :hosts ).and_return( [] )
+      allow( subject ).to receive( :hosts= )
+      expect( logger ).to receive( :warn )
+      expect( subject ).to receive( :skip_test ).
+        with( 'No suitable hosts found' )
+
+      subject.confine( :to, {} )
+    end
+
+    it 'raises when given mode is not :to or :except' do
+      allow( subject ).to receive( :hosts )
+      allow( subject ).to receive( :hosts= )
+
+      expect {
+        subject.confine( :regardless, {:thing => 'value'} )
+      }.to raise_error( 'Unknown option regardless' )
+    end
+
+    it 'rejects hosts that do not meet simple hash criteria' do
+      hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'} ]
+
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts= ).
+        with( [ {'thing' => 'foo'} ] )
+
+      subject.confine :to, :thing => 'foo'
+    end
+
+    it 'rejects hosts that match a list of criteria' do
+      hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'}, {'thing' => 'baz'} ]
+
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :hosts= ).
+        with( [ {'thing' => 'bar'} ] )
+
+      subject.confine :except, :thing => ['foo', 'baz']
+    end
+
+    it 'rejects hosts when a passed block returns true' do
+      host1 = {'platform' => 'solaris'}
+      host2 = {'platform' => 'solaris'}
+      host3 = {'platform' => 'windows'}
+      ret1 = (Struct.new('Result1', :stdout)).new(':global')
+      ret2 = (Struct.new('Result2', :stdout)).new('a_zone')
+      hosts = [ host1, host2, host3 ]
+
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :on ).
+        with( host1, '/sbin/zonename' ).
+        and_return( ret1 )
+      expect( subject ).to receive( :on ).
+        with( host1, '/sbin/zonename' ).
+        and_return( ret2 )
+
+      expect( subject ).to receive( :hosts= ).with( [ host1 ] )
+
+      subject.confine :to, :platform => 'solaris' do |host|
+        subject.on( host, '/sbin/zonename' ).stdout =~ /:global/
+      end
+    end
+  end
+
+  describe '#select_hosts' do
+    let(:logger) { double.as_null_object }
+    before do
+      allow( subject ).to receive( :logger ).and_return( logger )
+    end
+
+    it 'it returns an empty array if there are no applicable hosts' do
+      hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'} ]
+
+      expect(subject.select_hosts( {'thing' => 'nope'}, hosts )).to be == []
+    end
+
+    it 'selects hosts that match a list of criteria' do
+      hosts = [ {'thing' => 'foo'}, {'thing' => 'bar'}, {'thing' => 'baz'} ]
+
+      expect(subject.select_hosts( {:thing => ['foo', 'baz']}, hosts )).to be == [ {'thing' => 'foo'}, {'thing' => 'baz'} ]
+    end
+
+    it 'selects hosts when a passed block returns true' do
+      host1 = {'platform' => 'solaris1'}
+      host2 = {'platform' => 'solaris2'}
+      host3 = {'platform' => 'windows'}
+      ret1 = double('result1')
+      allow( ret1 ).to receive( :stdout ).and_return(':global')
+      ret2 = double('result2')
+      allow( ret2 ).to receive( :stdout ).and_return('a_zone')
+      hosts = [ host1, host2, host3 ]
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+
+      expect( subject ).to receive( :on ).with( host1, '/sbin/zonename' ).once.and_return( ret1 )
+      expect( subject ).to receive( :on ).with( host2, '/sbin/zonename' ).once.and_return( ret2 )
+
+      selected_hosts = subject.select_hosts 'platform' => 'solaris' do |host|
+                             subject.on(host, '/sbin/zonename').stdout =~ /:global/
+      end
+      expect( selected_hosts ).to be == [ host1 ]
+    end
+  end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -21,6 +21,50 @@ describe Beaker do
                            hosts }
   let( :dummy_class )    { Class.new { include Beaker::HostPrebuiltSteps } }
 
+  shared_examples 'enables_root_login' do |platform, commands, non_cygwin|
+    subject { dummy_class.new }
+    it "can enable root login on #{platform}" do
+      hosts = make_hosts( { :platform => platform, :is_cygwin => non_cygwin} )
+
+      if commands.empty?
+        expect( Beaker::Command ).to receive( :new ).exactly( 0 ).times
+      end
+
+      commands.each do | command |
+        expect( Beaker::Command ).to receive( :new ).with(command).exactly( 3 ).times
+      end
+
+      subject.enable_root_login( hosts, options )
+    end
+  end
+
+  # Non-cygwin Windows
+  it_should_behave_like 'enables_root_login', 'pswindows', [], false
+
+  # Non-cygwin Windows
+  it_should_behave_like 'enables_root_login', 'windows', [
+    "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""
+  ], true
+
+  it_should_behave_like 'enables_root_login', 'osx', [
+    "sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config",
+    "sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"
+  ]
+
+  ['debian','ubuntu','cumulus'].each do | deb_like |
+    it_should_behave_like 'enables_root_login', deb_like, [
+      "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+      "sudo su -c \"service ssh restart\""
+    ]
+  end
+
+  ['centos','el-','redhat','fedora','eos'].each do | rhel_like |
+    it_should_behave_like 'enables_root_login', rhel_like, [
+      "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
+      "sudo -E /sbin/service sshd reload"
+    ]
+  end
+
   context 'timesync' do
 
     subject { dummy_class.new }

data/spec/beaker/host_spec.rb

@@ -594,5 +594,46 @@ module Beaker
       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
+          @platform = 'mac-osx-foo-tigerlion'
+          expect{ host.build_deprecated_keys() }.not_to raise_error
+        end
+
+        it 'returns an empty array for unsupported host types' do
+          @platform = 'mac-osx-foo-tigerlion'
+          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/vagrant_spec.rb

@@ -34,6 +34,7 @@ module Beaker
       vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
       expect( vagrantfile ).to be === <<-EOF
 Vagrant.configure("2") do |c|
+  c.ssh.insert_key = false
   c.vm.define 'vm1' do |v|
     v.vm.hostname = 'vm1'
     v.vm.box = 'vm1_of_my_box'
@@ -185,7 +186,7 @@ EOF
       allow( file ).to receive( :path ).and_return( '/path/sshconfig' )
       allow( file ).to receive( :rewind ).and_return( true )
 
-      expect( Tempfile ).to receive( :new ).with( "#{host.name}").and_return( file ) 
+      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")
 
       vagrant.set_ssh_config( host, 'root' )

data/spec/beaker/logger_spec.rb

@@ -6,6 +6,7 @@ module Beaker
     let(:my_io)     { MockIO.new                         }
     let(:logger)    { Logger.new(my_io, :quiet => true)  }
     let(:test_dir)  { 'tmp/tests' }
+    let(:dummy_prefix)  { 'dummy' }
 
     context '#convert' do
       let(:valid_utf8)  { "/etc/puppet/modules\n├── jimmy-appleseed (\e[0;36mv1.1.0\e[0m)\n├── jimmy-crakorn (\e[0;36mv0.4.0\e[0m)\n└── jimmy-thelock (\e[0;36mv1.0.0\e[0m)\n" }
@@ -28,12 +29,18 @@ module Beaker
 
       it 'generates path for a given timestamp' do
         input_time = Time.new(2014, 6, 2, 16, 31, 22, '-07:00')
-        expect( Logger.generate_dated_log_folder(test_dir, input_time) ).to be === File.join(test_dir, '2014-06-02_16_31_22')
+        expect( Logger.generate_dated_log_folder(test_dir, dummy_prefix, input_time) ).to be === File.join(test_dir, dummy_prefix, '2014-06-02_16_31_22')
       end
 
       it 'generates directory for a given timestamp' do
         input_time = Time.new(2011, 6, 10, 13, 7, 55, '-09:00')
-        expect( File.directory? Logger.generate_dated_log_folder(test_dir, input_time) ).to be_truthy
+        expect( File.directory? Logger.generate_dated_log_folder(test_dir, dummy_prefix, input_time) ).to be_truthy
+      end
+
+      it 'generates nested directories if given as a log_prefix' do
+        input_time = Time.new(2011, 6, 10, 13, 7, 55, '-09:00')
+        prefix = 'a/man/a/plan/a/canal/panama'
+        expect( File.directory? Logger.generate_dated_log_folder(test_dir, prefix, input_time) ).to be_truthy
       end
 
     end

data/spec/beaker/network_manager_spec.rb

@@ -7,7 +7,13 @@ module Beaker
       mock_provisioning_logger = Object.new
       allow( mock_provisioning_logger ).to receive( :notify )
       mock_provisioning_logger }
-    let( :options ) { make_opts.merge({ 'logger' => double().as_null_object, :logger_sut => mock_provisioning_logger }) }
+    let( :options ) {
+      make_opts.merge({
+        'logger' => double().as_null_object,
+        :logger_sut => mock_provisioning_logger,
+        :log_prefix => 'log_prefix_dummy'
+      })
+    }
     let( :network_manager ) { NetworkManager.new(options, options[:logger]) }
     let( :hosts ) { make_hosts }
     let( :host ) { hosts[0] }

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,7 +6,8 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts) {["--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"]}
+      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"]}
+      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"}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}
@@ -18,7 +19,7 @@ module Beaker
       end
 
       it "supports all our command line options" do
-        expect(parser.parse(full_opts)).to be === {: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"}
+        expect(parser.parse(full_opts_in)).to be === full_opts_out
       end
 
       it "supports both validate options" do

data/spec/beaker/shared/semvar_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Beaker
+  module Shared
+    describe Semvar do
+
+      describe 'version_is_less' do
+
+        it 'reports 3.0.0-160-gac44cfb is not less than 3.0.0' do
+          expect( subject.version_is_less( '3.0.0-160-gac44cfb', '3.0.0' ) ).to be === false
+        end
+
+        it 'reports 3.0.0-160-gac44cfb is not less than 2.8.2' do
+          expect( subject.version_is_less( '3.0.0-160-gac44cfb', '2.8.2' ) ).to be === false
+        end
+
+        it 'reports 3.0.0 is less than 3.0.0-160-gac44cfb' do
+          expect( subject.version_is_less( '3.0.0', '3.0.0-160-gac44cfb' ) ).to be === true
+        end
+
+        it 'reports 2.8.2 is less than 3.0.0-160-gac44cfb' do
+          expect( subject.version_is_less( '2.8.2', '3.0.0-160-gac44cfb' ) ).to be === true
+        end
+
+        it 'reports 2.8 is less than 3.0.0-160-gac44cfb' do
+          expect( subject.version_is_less( '2.8', '3.0.0-160-gac44cfb' ) ).to be === true
+        end
+
+        it 'reports 2.8 is less than 2.9' do
+          expect( subject.version_is_less( '2.8', '2.9' ) ).to be === true
+        end
+      end
+    end
+
+  end
+end

data/spec/beaker/test_suite_spec.rb

@@ -207,5 +207,53 @@ module Beaker
 
 
     end
+
+    describe '#log_path' do
+      let( :sh_test   ) { '/my_shell_file.sh'   }
+      let( :files     ) { @files ? @files : [sh_test] }
+      let( :options   ) { make_opts.merge({ :logger => double().as_null_object, 'name' => create_files(files) }) }
+      let( :hosts     ) { make_hosts() }
+      let( :testsuite ) { Beaker::TestSuite.new( 'name', hosts, options, Time.now, :stop ) }
+
+      it 'returns the simple joining of the log dir & file as required' do
+        expect(testsuite.log_path('foo.txt', 'man/date')).to be === 'man/date/foo.txt'
+      end
+
+      describe 'builds the base directory correctly' do
+        # the base directory is where the latest symlink itself should live
+
+        it 'in the usual case' do
+          expect( File.symlink?('man/latest') ).to be_falsy
+          testsuite.log_path('foo.txt', 'man/date')
+          expect( File.symlink?('man/latest') ).to be_truthy
+        end
+
+        it 'if given a nested directory' do
+          expect( File.symlink?('a/latest') ).to be_falsy
+          testsuite.log_path('foo.txt', 'a/b/c/d/e/f')
+          expect( File.symlink?('a/latest') ).to be_truthy
+        end
+
+      end
+
+      describe 'builds the symlink directory correctly' do
+        # the symlink directory is where the symlink points to
+
+        it 'in the usual case' do
+          expect( File.symlink?('d/latest') ).to be_falsy
+          testsuite.log_path('foo.txt', 'd/e')
+          expect( File.readlink('d/latest') ).to be === 'e'
+        end
+
+        it 'if given a nested directory' do
+          expect( File.symlink?('f/latest') ).to be_falsy
+          testsuite.log_path('foo.txt', 'f/g/h/i/j/k')
+          expect( File.readlink('f/latest') ).to be === 'g/h/i/j/k'
+        end
+
+      end
+
+    end
+
   end
 end

data/spec/mocks.rb

@@ -44,6 +44,16 @@ module MockNet
       end
     end
 
+    class Put
+      def initialize uri
+        @uri = uri
+      end
+
+      def body= *args
+        hash
+      end
+    end
+
     class Delete
       def initialize uri
         @uri = uri

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -412,9 +412,18 @@ files:
 - lib/beaker/command_factory.rb
 - lib/beaker/dsl.rb
 - lib/beaker/dsl/assertions.rb
-- lib/beaker/dsl/ezbake_utils.rb
 - lib/beaker/dsl/helpers.rb
+- lib/beaker/dsl/helpers/facter_helpers.rb
+- lib/beaker/dsl/helpers/hiera_helpers.rb
+- lib/beaker/dsl/helpers/host_helpers.rb
+- lib/beaker/dsl/helpers/puppet_helpers.rb
+- 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/ezbake_utils.rb
+- lib/beaker/dsl/install_utils/module_utils.rb
+- lib/beaker/dsl/install_utils/pe_utils.rb
+- lib/beaker/dsl/install_utils/puppet_utils.rb
 - lib/beaker/dsl/outcomes.rb
 - lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
@@ -487,6 +496,7 @@ files:
 - lib/beaker/shared/error_handler.rb
 - lib/beaker/shared/host_manager.rb
 - lib/beaker/shared/repetition.rb
+- lib/beaker/shared/semvar.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
 - lib/beaker/tasks/rake_task.rb
@@ -499,8 +509,15 @@ files:
 - 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/helpers/facter_helpers_spec.rb
+- spec/beaker/dsl/helpers/hiera_helpers_spec.rb
+- spec/beaker/dsl/helpers/host_helpers_spec.rb
+- spec/beaker/dsl/helpers/puppet_helpers_spec.rb
+- spec/beaker/dsl/helpers/tk_helpers_spec.rb
+- spec/beaker/dsl/helpers/web_helpers_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
@@ -547,6 +564,7 @@ files:
 - spec/beaker/shared/error_handler_spec.rb
 - spec/beaker/shared/host_manager_spec.rb
 - spec/beaker/shared/repetition_spec.rb
+- spec/beaker/shared/semvar_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb
 - spec/beaker/test_suite_spec.rb