beaker 2.27.0 → 2.28.0

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

@@ -187,7 +187,7 @@ describe ClassMixedWithDSLInstallUtils do
         expect( subject ).to receive(:on).with(host, "echo C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules" ).and_return( result )
 
         expect( subject ).to receive(:scp_to).with(host, "/opt/testmodule2", "C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules", {:ignore => ignore_list})
-        expect( host ).to receive(:mv).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule2', 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules\\testmodule')
+        expect( host ).to receive(:mv).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules\\testmodule2', 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules\\testmodule')
 
         subject.copy_module_to(host, {:module_name => 'testmodule', :source => '/opt/testmodule2'})
       end

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

@@ -166,11 +166,10 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && hdiutil attach .dmg && installer -pkg /Volumes/puppet-enterprise-3.0/puppet-enterprise-installer-3.0.pkg -target /"
     end
 
-    it 'generates an EOS PE install command for an EOS host' do
+    it 'calls the EOS PE install command for an EOS host' do
       the_host = eoshost.dup
-      commands = ['enable', "extension puppet-enterprise-#{the_host['pe_ver']}-#{the_host['platform']}.swix"]
-      command = commands.join("\n")
-      expect( subject.installer_cmd( the_host, {} ) ).to be === "Cli -c '#{command}'"
+      expect( the_host ).to receive( :install_from_file ).with( /swix$/ )
+      subject.installer_cmd( the_host, {} )
     end
 
     it 'generates a unix PE install command in verbose for a unix host when pe_debug is enabled' do
@@ -279,17 +278,11 @@ describe ClassMixedWithDSLInstallUtils do
       subject.fetch_pe( [unixhost], {:fetch_local_then_push_to_host => true} )
     end
 
-    it 'can download a PE .swix from a URL to an EOS host and unpack it' do
+    it 'calls the host method to get an EOS .swix file from a URL' do
       allow( File ).to receive( :directory? ).and_return( false ) #is not local
-      allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
-      allow( subject ).to receive( :on ).and_return( true )
+      allow( subject ).to receive( :link_exists? ).and_return( true ) #skip file check
 
-      path = eoshost['pe_dir']
-      filename = "#{ eoshost['dist'] }"
-      extension = '.swix'
-      commands = ['enable', "copy #{path}/#{filename}#{extension} extension:"]
-      command = commands.join("\n")
-      expect( subject ).to receive( :on ).with( eoshost, "Cli -c '#{command}'" ).once
+      expect( eoshost ).to receive( :get_remote_file ).with( /swix$/ ).once
       subject.fetch_pe( [eoshost], {} )
     end
 
@@ -373,7 +366,7 @@ describe ClassMixedWithDSLInstallUtils do
         expect( host ).to eq( hosts[1] )
       end.once
       expect( subject ).to receive( :on ).with( hosts[2], / hdiutil attach puppet-enterprise-3.0-osx-10.9-x86_64.dmg && installer -pkg \/Volumes\/puppet-enterprise-3.0\/puppet-enterprise-installer-3.0.pkg -target \// ).once
-      expect( subject ).to receive( :on ).with( hosts[3], /^Cli/ ).once
+      expect( hosts[3] ).to receive( :install_from_file ).with( /swix$/ ).once
       #does extra mac/EOS specific commands
       expect( subject ).to receive( :on ).with( hosts[2], /puppet config set server/ ).once
       expect( subject ).to receive( :on ).with( hosts[3], /puppet config set server/ ).once

data/spec/beaker/host/eos_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+module Eos
+  describe Host do
+    let(:options)  { @options ? @options : {} }
+    let(:platform) {
+      if @platform
+        { :platform => Beaker::Platform.new( @platform) }
+      else
+        { :platform => Beaker::Platform.new( 'eos-vers-arch-extra' ) }
+      end
+    }
+    let(:host)    { make_host( 'name', options.merge(platform) ) }
+
+    describe '#get_puppet_agent_package_info' do
+      it 'raises an error if puppet_collection isn\'t passed' do
+        expect { host.get_puppet_agent_package_info(nil, 'maybe') }.to raise_error(ArgumentError)
+      end
+
+      it 'raises as error if puppet_agent_version isn\'t passed' do
+        expect { host.get_puppet_agent_package_info('maybe', nil) }.to raise_error(ArgumentError)
+      end
+
+      it 'returns two strings that include the passed parameters' do
+        return1, return2 = host.get_puppet_agent_package_info('pc1', 'pav1')
+        expect( return1 ).to match(/pc1/)
+        expect( return2 ).to match(/pav1/)
+      end
+
+      it 'gets the correct file type' do
+        _, return2 = host.get_puppet_agent_package_info('pc1', 'pav1')
+        expect( return2 ).to match(/swix/)
+      end
+    end
+
+    describe '#get_remote_file' do
+      it 'calls enable first' do
+        expect( host ).to receive( :execute ).with(/enable/)
+        host.get_remote_file( 'remote_url' )
+      end
+
+      it 'begins second line with the copy command' do
+        expect( host ).to receive( :execute ).with(/\ncopy/)
+        host.get_remote_file( 'remote_url' )
+      end
+
+      it 'ends second line with particular extension location' do
+        expect( host ).to receive( :execute ).with(/extension\:\'$/)
+        host.get_remote_file( 'remote_url' )
+      end
+    end
+
+    describe '#install_from_file' do
+      it 'calls enable first' do
+        expect( host ).to receive( :execute ).with(/enable/)
+        host.install_from_file( 'local_file' )
+      end
+
+      it 'begins second line with the extension command' do
+        expect( host ).to receive( :execute ).with(/\nextension/)
+        host.install_from_file( 'local_file' )
+      end
+    end
+  end
+end

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

@@ -145,6 +145,48 @@ module Beaker
 
     end
 
+    context "install_package_with_rpm" do
+
+      it "accepts a package as a single argument" do
+        @opts = {'platform' => 'el-is-me'}
+        pkg = 'redhat_package'
+        expect( Beaker::Command ).to receive(:new).with("rpm  -ivh #{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_with_rpm(pkg) ).to be == "hello"
+      end
+
+      it "accepts a package and additional options" do
+        @opts = {'platform' => 'el-is-me'}
+        pkg = 'redhat_package'
+        cmdline_args = '--foo'
+        expect( Beaker::Command ).to receive(:new).with("rpm #{cmdline_args} -ivh #{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_with_rpm(pkg, cmdline_args) ).to be == "hello"
+      end
+
+    end
+
+    context 'extract_rpm_proxy_options' do
+
+      [ 'http://myproxy.com:3128/',
+        'https://myproxy.com:3128/',
+        'https://myproxy.com:3128',
+        'http://myproxy.com:3128',
+      ].each do |url|
+        it "correctly extracts rpm proxy options for #{url}" do
+          expect( instance.extract_rpm_proxy_options(url) ).to be == '--httpproxy myproxy.com --httpport 3128'
+        end
+      end
+
+      url = 'http:/myproxy.com:3128'
+      it "fails to extract rpm proxy options for #{url}" do
+        expect{
+          instance.extract_rpm_proxy_options(url)
+        }.to raise_error(RuntimeError, /Cannot extract host and port/)
+      end
+
+    end
+
   end
 end
 

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -654,11 +654,18 @@ module Beaker
         expect( Socket ).to receive(:gethostname) { "foobar" }
         expect( aws ).to receive(:local_user) { "bob" }
 
-        options[:timestamp] = Time.now
-        date_part = options[:timestamp].strftime("%F_%H_%M_%S")
-
         # Should match the expected composite key name
-        expect(aws.key_name).to eq("Beaker-bob-foobar-#{date_part}")
+        expect(aws.key_name).to match(/^Beaker-bob-foobar-/)
+      end
+
+      it 'uses the generated random string from :aws_keyname_modifier' do
+        expect(aws.key_name).to match(/#{options[:aws_keyname_modifier]}/)
+      end
+
+      it 'uses nanosecond time value to make key name collision harder' do
+        options[:timestamp] = Time.now
+        nanosecond_value = options[:timestamp].strftime("%N")
+        expect(aws.key_name).to match(/#{nanosecond_value}/)
       end
     end
 
@@ -672,60 +679,14 @@ module Beaker
     describe '#ensure_key_pair' do
       let( :region ) { double('region', :name => 'test_region_name') }
       subject(:ensure_key_pair) { aws.ensure_key_pair(region) }
+      let( :key_name ) { "Beaker-rspec-SUT" }
 
-      context 'when a beaker keypair already exists' do
-        it 'returns the keypair if available' do
-          stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
-          key_pair = double(:exists? => true, :secret => 'supersekritkey', :delete => true)
-          allow( aws ).to receive( :key_name ).and_return( "Beaker-rspec-SUT" )
-          key_pairs = { "Beaker-rspec-SUT" => key_pair }
-
-          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
-          expect( aws ).to receive( :public_key ).and_return('test_ssh_string')
-          expect( key_pairs ).to receive( :import ).and_return(key_pair)
-          expect(ensure_key_pair).to eq(key_pair)
-        end
-
-        it 'generates a new keypair if :generate_new_keypair set' do
-          stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
-          key_pair = double(:exists? => true, :secret => 'keyOfSekritz', :delete => true)
-          allow( aws ).to receive( :key_name ).and_return( "Beaker-rspec-SUT" )
-          key_pairs = { "Beaker-rspec-SUT" => key_pair }
-          options[:keypair_generate_new] = true
+      it 'deletes the given keypair, then recreates it' do
+        allow( aws ).to receive( :key_name ).and_return(key_name)
 
-          answer = 'You get a keypair!  You get a keypair!  And you get a keypair too!'
-          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
-          expect( aws ).to receive( :public_key ).and_return('test_ssh_string')
-          expect( key_pairs ).to receive( :import ).and_return(answer)
-          returned_keypair = ensure_key_pair
-          expect(returned_keypair).not_to eq(key_pair)
-          expect(returned_keypair).to eq(answer)
-        end
-      end
-
-      context 'when a pre-existing keypair cannot be found' do
-        let( :key_name ) { "Beaker-rspec-SUT" }
-        let( :key_pair ) { double(:exists? => false) }
-        let( :key_pairs ) { { key_name => key_pair } }
-        let( :pubkey ) { "Beaker-rspec-SUT_secret-key" }
-
-        before :each do
-          stub_const('ENV', ENV.to_hash.merge('USER' => 'rspec'))
-          expect( region ).to receive(:key_pairs).and_return(key_pairs).twice
-          allow( aws ).to receive( :key_name ).and_return(key_name)
-        end
-
-        it 'imports a new key based on user pubkey' do
-          allow(aws).to receive(:public_key).and_return(pubkey)
-          expect( key_pairs ).to receive(:import).with(key_name, pubkey)
-          expect(ensure_key_pair)
-        end
-
-        it 'returns imported keypair' do
-          allow(aws).to receive(:public_key)
-          expect( key_pairs ).to receive(:import).and_return(key_pair).once
-          expect(ensure_key_pair).to eq(key_pair)
-        end
+        expect( aws ).to receive( :delete_key_pair ).with( region, key_name).once.ordered
+        expect( aws ).to receive( :create_new_key_pair ).with( region, key_name).once.ordered
+        ensure_key_pair
       end
     end
 

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -196,7 +196,7 @@ EOF
       allow( state ).to receive( :success? ).and_return( true )
       wait_thr.value = state
 
-      allow( Open3 ).to receive( :popen3 ).with( 'vagrant', 'ssh-config', name ).and_return( [ "", out, "", wait_thr ])
+      allow( Open3 ).to receive( :popen3 ).with( {"RUBYLIB"=>""}, 'vagrant', 'ssh-config', name ).and_return( [ "", out, "", wait_thr ])
 
       file = double( 'file' )
       allow( file ).to receive( :path ).and_return( '/path/sshconfig' )

data/spec/beaker/logger_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 module Beaker
   describe Logger do
-    let(:my_io)     { MockIO.new                         }
+    let(:my_io)     { StringIO.new                         }
     let(:logger)    { Logger.new(my_io, :quiet => true)  }
     let(:test_dir)  { 'tmp/tests' }
     let(:dummy_prefix)  { 'dummy' }

data/spec/mocks.rb

@@ -1,18 +1,5 @@
 require 'rspec/mocks'
 
-class MockIO < IO
-  def initialize
-  end
-
-  methods.each do |meth|
-    define_method(:meth) {}
-  end
-
-  def === other
-    super other
-  end
-end
-
 module MockNet
   class HTTP
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.27.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -381,6 +381,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -388,6 +391,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.25'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.35.0
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -421,7 +427,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- acceptance/config/acceptance-options.rb
 - acceptance/fixtures/README.md
+- acceptance/fixtures/files/failing_shell_script.txt
+- acceptance/fixtures/files/retry_script.txt
+- acceptance/fixtures/files/shell_script_with_output.txt
+- acceptance/fixtures/files/simple_text_file.txt
+- acceptance/fixtures/files/sles-11-x86_64.repo
 - acceptance/fixtures/module/Gemfile
 - acceptance/fixtures/module/README.md
 - acceptance/fixtures/module/Rakefile
@@ -463,22 +475,78 @@ files:
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-i386.repo
 - acceptance/fixtures/package/rpm/pl-puppetserver-latest-repos-pe-fedora-22-x86_64.repo
 - acceptance/lib/beaker/acceptance/install_utils.rb
+- acceptance/lib/helpers/test_helper.rb
 - acceptance/pre_suite/README.md
 - acceptance/pre_suite/pe/install.rb
 - acceptance/pre_suite/puppet_gem/install.rb
 - acceptance/pre_suite/puppet_git/install.rb
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
+- acceptance/tests/base/dsl/helpers/configuration_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/add_system32_hosts_entry_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/backup_the_file_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/create_remote_file_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/create_tmpdir_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/curl_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/deploy_package_repo_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/echo_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/install_package_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/retry_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/rsync_to_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/run_cron_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/run_script_on_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/run_script_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/scp_from_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/scp_to_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/shell_test.rb
+- acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb
+- acceptance/tests/base/dsl/install_utils/clone_git_repo_on_test.rb
 - acceptance/tests/base/dsl/structure_test.rb
-- acceptance/tests/base/host.rb
+- acceptance/tests/base/host_test.rb
 - acceptance/tests/base/packages.rb
 - acceptance/tests/base/packages_unix.rb
-- acceptance/tests/dsl/install_utils/clone_git_repo_on.rb
-- acceptance/tests/hypervisor/communication.rb
+- acceptance/tests/hypervisor/communication_test.rb
+- acceptance/tests/load_path_bootstrap.rb
 - acceptance/tests/puppet/README.md
-- acceptance/tests/puppet/install_smoke.rb
+- acceptance/tests/puppet/install_smoke_test.rb
 - beaker.gemspec
 - bin/beaker
+- docs/Access-the-Live-Test-Console-with-Pry.md
+- docs/Argument-Processing-and-Precedence.md
+- docs/Beaker-Installation.md
+- docs/Beaker-Owners-and-Reviewers.md
+- docs/Beaker-Test-Tagging.md
+- docs/Beaker-with-Masterless-Puppet.md
+- docs/Creating-A-Test-Environment.md
+- docs/Docker-Support.md
+- docs/EC2-Support.md
+- docs/Example-Vagrant-Hosts-Files.md
+- docs/File-a-Beaker-Bug.md
+- docs/Google-Compute-Engine-Support.md
+- docs/How-To-Beaker.md
+- docs/How-To-Use-User-Password-Authentication-with-Beaker.md
+- docs/How-to-Write-a-Beaker-Test-for-a-Module.md
+- docs/Lets-Write-a-Test.md
+- docs/Openstack-Support.md
+- docs/Overview.md
+- docs/README.md
+- docs/Roles-What-Are-They.md
+- docs/Shared-Options-for-Executing-Beaker-Commands.md
+- docs/Solaris-Support.md
+- docs/The-Beaker-DSL.md
+- docs/The-Command-Line.md
+- docs/Types,-Puppet-4,-and-the-All-In-One-Agent.md
+- docs/VMWare-Fusion-Support.md
+- docs/Vagrant-Support.md
+- docs/beaker-vs.-beaker-rspec.md
+- docs/hosts/README.md
+- docs/hosts/eos.md
+- docs/hypervisors/README.md
+- docs/hypervisors/aws.md
+- docs/vSphere-Support.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
 - lib/beaker/cli.rb
@@ -514,6 +582,7 @@ files:
 - lib/beaker/host/aix/file.rb
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
+- lib/beaker/host/eos.rb
 - lib/beaker/host/freebsd.rb
 - lib/beaker/host/freebsd/exec.rb
 - lib/beaker/host/freebsd/pkg.rb
@@ -609,6 +678,7 @@ files:
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
+- spec/beaker/host/eos_spec.rb
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb

data/acceptance/tests/dsl/install_utils/clone_git_repo_on.rb

@@ -1,50 +0,0 @@
-begin
-  $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-  require 'beaker/acceptance/install_utils'
-  extend Beaker::Acceptance::InstallUtils
-end
-test_name 'Clone from git'
-
-PACKAGES = {
-  :redhat => [
-    'git',
-  ],
-  :debian => [
-    ['git', 'git-core'],
-  ],
-  :solaris_11 => [
-    ['git', 'developer/versioning/git'],
-  ],
-  :solaris_10 => [
-    'coreutils',
-    'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
-    'git',
-  ],
-  :windows => [
-    'git',
-  ],
-  :sles => [
-    'git-core',
-  ]
-}
-
-install_packages_on(hosts, PACKAGES, :check_if_exists => true)
-
-# build_giturl implicitly looks these up
-ENV['HIERA_FORK']='puppetlabs'
-ENV['FORK']='fail'
-
-# implicitly tests build_giturl() and lookup_in_env()
-hosts.each do |host|
-  on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
-  testdir = create_tmpdir_on(host, File.basename(__FILE__))
-
-  step 'should find fork name from the correct environment variable'
-  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('puppet')))
-  assert_match( /github\.com\/fail/, result.cmd, 'Did not find correct fork name')
-  assert_equal( 1, result.exit_code, 'Did not produce error exit_code of 1')
-
-  step 'should clone hiera from correct fork'
-  results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
-  assert_match( /From.*github\.com\/puppetlabs\/hiera/, result.output, 'Did not find clone')
-end