beaker 2.39.0 → 2.40.0

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -551,6 +551,15 @@ describe ClassMixedWithDSLHelpers do
         })
       end
 
+      describe 'when the global option for :is_puppetserver is false' do
+        it 'checks the option for the host object' do
+          allow( subject ).to receive( :options) .and_return( {:is_puppetserver => false})
+          host[:is_puppetserver] = true
+          expect( subject ).to receive( :modify_tk_config)
+          subject.with_puppet_running_on(host, conf_opts)
+        end
+      end
+
       describe 'and command line args passed' do
         it 'modifies SUT trapperkeeper configuration w/ command line args' do
           host['puppetserver-confdir'] = '/etc/puppetserver/conf.d'

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -455,13 +455,15 @@ describe ClassMixedWithDSLInstallUtils do
       end
     end
     context 'on debian' do
-      let(:platform) { Beaker::Platform.new('debian-7-amd64') }
-      it 'installs latest if given no version info' do
-        hosts.each do |host|
-          expect(subject).to receive(:install_puppetlabs_release_repo).with(host)
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
+        it "installs latest on #{platform} if given no version info" do
+          hosts.each do |host|
+            expect(subject).to receive(:install_puppetlabs_release_repo).with(host)
+          end
+          expect(hosts[0]).to receive(:install_package).with('puppet')
+          subject.install_puppet
         end
-        expect(hosts[0]).to receive(:install_package).with('puppet')
-        subject.install_puppet
       end
       it 'installs specific version of puppet when passed :version' do
         expect(hosts[0]).to receive(:install_package).with('puppet=3-1puppetlabs1')
@@ -531,17 +533,18 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe 'configure_puppet_on' do
     context 'on debian' do
-      let(:platform) { 'debian-7-amd64' }
-      let(:host) { make_host('testbox.test.local', :platform => 'debian-7-amd64') }
-
-      it 'it sets the puppet.conf file to the provided config' do
-        config = { 'main' => {'server' => 'testbox.test.local'} }
-        expected_config_string = "[main]\nserver=testbox.test.local\n\n"
-
-        expect( subject ).to receive( :create_remote_file ).with(
-          host, anything, expected_config_string
-        )
-        subject.configure_puppet_on(host, config)
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
+        let(:host) { make_host('testbox.test.local', :platform => "#{platform}") }
+        it "it sets the puppet.conf file to the provided config on #{platform}" do
+          config = { 'main' => {'server' => 'testbox.test.local'} }
+          expected_config_string = "[main]\nserver=testbox.test.local\n\n"
+
+          expect( subject ).to receive( :create_remote_file ).with(
+              host, anything, expected_config_string
+          )
+          subject.configure_puppet_on(host, config)
+        end
       end
     end
     context 'on windows' do
@@ -571,14 +574,15 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     context 'on debian' do
-      let(:platform) { 'debian-7-amd64' }
-
-      it 'calls configure_puppet_on correctly' do
-        config = { 'main' => {'server' => 'testbox.test.local'} }
-        expect( subject ).to receive( :configure_puppet_on ).with(
-          anything, config
-        ).exactly( hosts.length ).times
-        subject.configure_puppet(config)
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
+        it "calls configure_puppet_on correctly on #{platform}" do
+          config = { 'main' => {'server' => 'testbox.test.local'} }
+          expect( subject ).to receive( :configure_puppet_on ).with(
+              anything, config
+          ).exactly( hosts.length ).times
+          subject.configure_puppet(config)
+        end
       end
     end
 
@@ -722,11 +726,13 @@ describe ClassMixedWithDSLInstallUtils do
       end
 
       describe "that are debian-like" do
-        let( :platform ) { Beaker::Platform.new('debian-7-i386') }
-        before { allow(subject).to receive(:link_exists?).and_return(true) }
+        PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+          let(:platform) { Beaker::Platform.new("#{platform}-ver-arch") }
+          before { allow(subject).to receive(:link_exists?).and_return(true) }
 
-        include_examples "install-dev-repo"
+          include_examples "install-dev-repo"
 
+        end
       end
 
       describe "that are redhat-like" do

data/spec/beaker/dsl/install_utils/windows_utils_spec.rb

@@ -40,6 +40,17 @@ describe ClassMixedWithDSLInstallUtils do
       .exactly( times ).times
   end
 
+  def expect_version_log_called(times = hosts.length)
+    [
+      "\"%ProgramFiles%\\Puppet Labs\\puppet\\misc\\versions.txt\"",
+      "\"%ProgramFiles(x86)%\\Puppet Labs\\puppet\\misc\\versions.txt\"",
+    ].each do |path|
+      expect( Beaker::Command ).to receive( :new )
+        .with( "if exist #{path} type #{path}", [], {:cmdexe => true} )
+        .exactly( times ).times
+    end
+  end
+
   def expect_script_matches(hosts, contents)
     hosts.each do |host|
       expect( host )
@@ -60,6 +71,7 @@ describe ClassMixedWithDSLInstallUtils do
     it "will specify a PUPPET_AGENT_STARTUP_MODE of Manual (disabling the service) by default" do
       expect_install_called
       expect_status_called
+      expect_version_log_called
       expect( subject ).to receive( :create_install_msi_batch_on ).with(
           anything, anything,
           'PUPPET_AGENT_STARTUP_MODE' => 'Manual')
@@ -69,6 +81,7 @@ describe ClassMixedWithDSLInstallUtils do
     it "allows configuration of PUPPET_AGENT_STARTUP_MODE" do
       expect_install_called
       expect_status_called
+      expect_version_log_called
       value = 'Automatic'
       expect( subject ).to receive( :create_install_msi_batch_on ).with(
           anything, anything,
@@ -97,6 +110,7 @@ describe ClassMixedWithDSLInstallUtils do
     it "will generate a command to emit a log file with the :debug option set" do
       expect_install_called
       expect_status_called
+      expect_version_log_called
 
       expect( Beaker::Command ).to receive( :new ).with( /^type \".*\.log\"$/, [], {:cmdexe => true} ).exactly( hosts.length ).times
       subject.install_msi_on(hosts, msi_path, {}, { :debug => true })
@@ -105,6 +119,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'will pass msi_path to #create_install_msi_batch_on as-is' do
       expect_install_called
       expect_status_called
+      expect_version_log_called
       test_path = 'test/path'
       expect( subject ).to receive( :create_install_msi_batch_on ).with(
           anything, test_path, anything)

data/spec/beaker/host/unix/exec_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 module Beaker
+
   describe Unix::Exec do
     class UnixExecTest
       include Unix::Exec
@@ -70,6 +71,26 @@ module Beaker
     end
 
     describe '#ssh_permit_user_environment' do
+      context 'When called without error' do
+        let (:directory) {'/directory'}
+        let (:ssh_command) {"echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"}
+        let (:ssh_move) {"mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"}
+
+        platforms = PlatformHelpers::SYSTEMDPLATFORMS + PlatformHelpers::DEBIANPLATFORMS + PlatformHelpers::SYSTEMVPLATFORMS
+
+        platforms.each do |platform|
+          it "calls the correct commands for #{platform}" do
+            opts['platform'] = platform
+            expect(instance).to receive(:exec).twice
+            expect(instance).to receive(:create_tmpdir_on).and_return(directory)
+            expect(Beaker::Command).to receive(:new).with(ssh_move)
+            expect(Beaker::Command).to receive(:new).with(ssh_command)
+            expect(instance).to receive(:ssh_service_restart)
+            expect{instance.ssh_permit_user_environment}.to_not raise_error
+          end
+        end
+      end
+
       it 'raises an error on unsupported platforms' do
         opts['platform'] = 'notarealthing01-parts-arch'
         expect {
@@ -79,6 +100,33 @@ module Beaker
     end
 
     describe '#ssh_service_restart' do
+      PlatformHelpers::SYSTEMDPLATFORMS.each do |platform|
+        it "calls the correct command for #{platform}" do
+          opts['platform'] = platform 
+          expect(instance).to receive(:exec)
+          expect(Beaker::Command).to receive(:new).with("systemctl restart sshd.service")
+          expect{instance.ssh_service_restart}.to_not raise_error
+        end
+      end
+
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        it "calls the correct command for #{platform}" do
+          opts['platform'] = platform
+          expect(instance).to receive(:exec)
+          expect(Beaker::Command).to receive(:new).with("service ssh restart")
+          expect{instance.ssh_service_restart}.to_not raise_error
+        end
+      end
+
+      PlatformHelpers::SYSTEMVPLATFORMS.each do |platform|
+        it "calls the correct command for #{platform}" do
+          opts['platform'] = "#{platform}-arch"
+          expect(instance).to receive(:exec)
+          expect(Beaker::Command).to receive(:new).with("/sbin/service sshd restart")
+          expect{instance.ssh_service_restart}.to_not raise_error
+        end
+      end
+
       it 'raises an error on unsupported platforms' do
         opts['platform'] = 'notarealthing02-parts-arch'
         expect {

data/spec/beaker/host/unix/pkg_spec.rb

@@ -41,6 +41,13 @@ module Beaker
           instance.deploy_package_repo(path,name,version)
         end
 
+        it 'calls #deploy_apt_repo for huaweios systems' do
+          @opts = {'platform' => 'huaweios-is-me'}
+          expect(instance).to receive(:deploy_apt_repo)
+          allow(File).to receive(:exists?).with(path).and_return(true)
+          instance.deploy_package_repo(path,name,version)
+        end
+
         it 'calls #deploy_apt_repo for debian systems' do
           @opts = {'platform' => 'ubuntu-is-me'}
           expect(instance).to receive(:deploy_apt_repo)
@@ -123,6 +130,13 @@ module Beaker
         expect( instance.check_for_package(pkg) ).to be === true
       end
 
+      it "checks correctly on huaweios" do
+        @opts = {'platform' => 'huaweios-is-me'}
+        pkg = 'debian_package'
+        expect( Beaker::Command ).to receive(:new).with("dpkg -s #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( instance ).to receive(:exec).with('', :accept_all_exit_codes => true).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.check_for_package(pkg) ).to be === true
+      end
       it "checks correctly on debian" do
         @opts = {'platform' => 'debian-is-me'}
         pkg = 'debian_package'
@@ -178,8 +192,28 @@ module Beaker
 
     end
 
+    describe '#update_apt_if_needed' do
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        it "calls update for #{platform}" do
+          @opts = {'platform' => platform}
+          instance.instance_variable_set("@apt_needs_update", true)
+          expect(instance).to receive('execute').with("apt-get update")
+          expect{instance.update_apt_if_needed}.to_not raise_error
+        end
+      end
+    end
     context "install_package" do
 
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        it "uses apt-get for #{platform}" do
+          @opts = {'platform' => platform}
+          pkg = 'pkg'
+          expect( Beaker::Command ).to receive(:new).with("apt-get install --force-yes  -y #{pkg}", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          expect( instance.install_package(pkg) ).to be == "hello"
+        end
+      end
+
       it "uses yum on fedora-20" do
         @opts = {'platform' => 'fedora-20-is-me'}
         pkg = 'fedora_package'
@@ -197,6 +231,27 @@ module Beaker
       end
     end
 
+    describe '#uninstall_package' do
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        it "calls pkg uninstall for #{platform}" do
+          @opts = {'platform' => platform}
+          expect( Beaker::Command ).to receive(:new).with("apt-get purge  -y pkg", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          expect(instance.uninstall_package('pkg')).to be == "hello"
+        end
+      end
+    end
+
+    describe '#upgrade_package' do
+      PlatformHelpers::DEBIANPLATFORMS.each do |platform|
+        it "calls the correct apt-get incantation for #{platform}" do
+          @opts = {'platform' => platform}
+          expect( Beaker::Command ).to receive(:new).with("apt-get install -o Dpkg::Options::='--force-confold'  -y --force-yes pkg", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          expect(instance.upgrade_package('pkg')).to be == "hello"
+        end
+      end
+    end
     context "install_package_with_rpm" do
 
       it "accepts a package as a single argument" do

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -157,7 +157,7 @@ describe Beaker do
     it "can return the correct url for an el-7 host" do
       host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-7-platform') } )
 
-      expect( subject.epel_info_for( host, options )).to be === ["http://mirrors.kernel.org/fedora-epel/7", "x86_64", "epel-release-7-5.noarch.rpm"]
+      expect( subject.epel_info_for( host, options )).to be === ["http://mirrors.kernel.org/fedora-epel/7", "x86_64", "epel-release-7-6.noarch.rpm"]
     end
 
     it "can return the correct url for an el-6 host" do

data/spec/beaker/host_spec.rb

@@ -293,7 +293,7 @@ module Beaker
         expect { host.exec(command, opts) }.to raise_error(Beaker::Host::CommandFailure)
       end
 
-      it 'does not throw an error when an unacceptable exit code is returned and the accept_all_exit_codes flag is set' do
+      it 'does throw an error when an unacceptable exit code is returned and the accept_all_exit_codes flag is set' do
         result.exit_code = 7
         opts = {
           :acceptable_exit_codes  => [0, 1],
@@ -301,11 +301,11 @@ module Beaker
         }
         allow( host.logger ).to receive( :warn )
 
-        expect { host.exec(command, opts) }.to_not raise_error
+        expect { host.exec(command, opts) }.to raise_error
       end
 
       it 'sends a warning when both :acceptable_exit_codes & :accept_all_exit_codes are set' do
-        result.exit_code = 7
+        result.exit_code = 1
         opts = {
           :acceptable_exit_codes  => [0, 1],
           :accept_all_exit_codes  => true

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", "--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", "--no-color-host-output",  "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6",        "--xml-time-order"]}
-      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, :color_host_output=>false, :beaker_version_print=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>"normal", :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => 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", "--pre-cleanup", "pre_cleanup.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", "--no-color-host-output",  "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6",        "--xml-time-order"]}
+      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", :pre_cleanup => "pre_cleanup.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, :color_host_output=>false, :beaker_version_print=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>"normal", :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}
@@ -39,7 +39,7 @@ module Beaker
       end
 
       it "can produce a usage description" do
-        expect{parser.usage}.to_not raise_error 
+        expect{parser.usage}.to_not raise_error
       end
 
       context '--no-provision flag effects other options' do

data/spec/helpers.rb

@@ -111,3 +111,26 @@ module HostHelpers
   end
 
 end
+
+module PlatformHelpers
+
+  DEBIANPLATFORMS = ['debian',
+                     'ubuntu',
+                     'cumulus',
+                     'huaweios']
+
+  SYSTEMDPLATFORMS = ['el-7',
+                      'centos-7',
+                      'redhat-7',
+                      'oracle-7',
+                      'scientific-7',
+                      'eos-7']
+
+  SYSTEMVPLATFORMS = ['el-',
+                      'centos',
+                      'fedora',
+                      'redhat',
+                      'oracle',
+                      'scientific',
+                      'eos']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.39.0
+  version: 2.40.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -353,6 +353,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -360,6 +363,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -604,6 +610,8 @@ files:
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
 - docs/hypervisors/vagrant.md
+- docs/meta/README.md
+- docs/meta/ticket_process.md
 - docs/vSphere-Support.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb