beaker 2.47.1 → 2.48.0

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.47.1'
+    STRING = '2.48.0'
   end
 end

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

@@ -318,22 +318,48 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#stub_hosts_on' do
     it 'executes puppet on the host passed and ensures it is reverted' do
+      test_host = make_host('my_host', {})
       allow( subject ).to receive( :hosts ).and_return( hosts )
       logger = double.as_null_object
 
+      expect( subject ).to receive( :on ).once
       allow( subject ).to receive( :logger ).and_return( logger )
-      expect( subject ).to receive( :on ).twice
       expect( subject ).to receive( :teardown ).and_yield
-      expect( subject ).to receive( :puppet ).once.
-        with( 'resource', 'host',
-              'puppetlabs.com',
-              'ensure=present', 'ip=127.0.0.1' )
+      manifest =<<-EOS.gsub /^\s+/, ""
+        host { 'puppetlabs.com':
+          \tensure       => present,
+          \tip           => '127.0.0.1',
+          \thost_aliases => [],
+        }
+      EOS
+      expect( subject ).to receive( :apply_manifest_on ).once.
+        with( test_host, manifest )
       expect( subject ).to receive( :puppet ).once.
         with( 'resource', 'host',
               'puppetlabs.com',
               'ensure=absent' )
 
-      subject.stub_hosts_on( make_host('my_host', {}), 'puppetlabs.com' => '127.0.0.1' )
+      subject.stub_hosts_on( test_host, {'puppetlabs.com' => '127.0.0.1'} )
+    end
+    it 'adds aliases to defined hostname' do
+      test_host = make_host('my_host', {})
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      logger = double.as_null_object
+
+      expect( subject ).to receive( :on ).once
+      allow( subject ).to receive( :logger ).and_return( logger )
+      expect( subject ).to receive( :teardown ).and_yield
+      manifest =<<-EOS.gsub /^\s+/, ""
+        host { 'puppetlabs.com':
+          \tensure       => present,
+          \tip           => '127.0.0.1',
+          \thost_aliases => [\"foo\", \"bar\"],
+        }
+      EOS
+      expect( subject ).to receive( :apply_manifest_on ).once.
+        with( test_host, manifest )
+
+      subject.stub_hosts_on( test_host, {'puppetlabs.com' => '127.0.0.1'}, {'puppetlabs.com' => ['foo','bar']} )
     end
   end
 
@@ -355,9 +381,7 @@ describe ClassMixedWithDSLHelpers do
       expect( Resolv ).to receive( :getaddress ).
         with( 'my_forge.example.com' ).and_return( '127.0.0.1' )
       expect( subject ).to receive( :stub_hosts_on ).
-        with( host, 'forge.puppetlabs.com' => '127.0.0.1' )
-      expect( subject ).to receive( :stub_hosts_on ).
-        with( host, 'forgeapi.puppetlabs.com' => '127.0.0.1' )
+        with( host, {'forge.puppetlabs.com' => '127.0.0.1'}, {'forge.puppetlabs.com' => ['forge.puppet.com','forgeapi.puppetlabs.com','forgeapi.puppet.com']} )
 
       subject.stub_forge_on( host, 'my_forge.example.com' )
     end

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

@@ -945,6 +945,30 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_puppet_agent_dev_repo_on( host, opts )
     end
 
+    it 'runs the correct install for el-based platforms on s390x architectures' do
+      platform = Object.new()
+      allow(platform).to receive(:to_array) { ['el', '5', 's390x'] }
+      host = basic_hosts.first
+      host['platform'] = platform
+      sha_value = 'ereiuwoiur'
+      opts = { :version => '0.1.0', :puppet_agent_sha => sha_value }
+      allow( subject ).to receive( :options ).and_return( {} )
+
+      release_path_end = 'fake_release_path_end'
+      release_file = 'fake_29835_release_file'
+      expect( host ).to receive( :puppet_agent_dev_package_info ).and_return(
+        [ release_path_end, release_file ] )
+
+      expect(subject).not_to receive(:install_puppetlabs_dev_repo)
+      expect(host).not_to receive(:install_package)
+
+      expect(subject).to receive(:fetch_http_file).once.with(/#{release_path_end}$/, release_file, /\/el$/)
+      expect(subject).to receive(:scp_to).once.with(host, /#{release_file}$/, anything)
+      expect(subject).to receive(:on).ordered.with(host, /rpm -ivh.*#{release_file}$/)
+
+      subject.install_puppet_agent_dev_repo_on( host, opts )
+    end
+
     it 'runs the correct install for debian-based platforms' do
       platform = Object.new()
       allow(platform).to receive(:to_array) { ['debian', '5', 'x4']}

data/spec/beaker/host_spec.rb

@@ -186,7 +186,7 @@ module Beaker
       it "does nothing if the key/value pair already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^key=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).once.and_return(result)
 
         host.add_env_var('key', '/my/first/value')
@@ -195,24 +195,24 @@ module Beaker
       it "adds new line to environment file if no env var of that name already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^key=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::Command ).to receive(:new).with(/grep \^KEY ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^key ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::Command ).to receive(:new).with("echo \"KEY=/my/first/value\" >> ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("echo \"key=/my/first/value\" >> ~/.ssh/environment")
         host.add_env_var('key', '/my/first/value')
       end
 
       it "updates existing line in environment file when adding additional value to existing variable" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^key=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with(/grep \^KEY ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^key ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/^KEY=/KEY=\\/my\\/first\\/value:/', '~/.ssh/environment')
+        expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/^key=/key=\\/my\\/first\\/value:/', '~/.ssh/environment')
         host.add_env_var('key', '/my/first/value')
       end
 
@@ -220,9 +220,9 @@ module Beaker
 
     describe "#delete_env_var" do
       it "deletes env var" do
-        expect( Beaker::SedCommand ).to receive(:new).with('unix', '/KEY=\\/my\\/first\\/value$/d', '~/.ssh/environment')
-        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/KEY=\\(.*\\)[;:]\\/my\\/first\\/value/KEY=\\1/", "~/.ssh/environment")
-        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/KEY=\\/my\\/first\\/value[;:]/KEY=/", "~/.ssh/environment")
+        expect( Beaker::SedCommand ).to receive(:new).with('unix', '/key=\\/my\\/first\\/value$/d', '~/.ssh/environment')
+        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/key=\\(.*\\)[;:]\\/my\\/first\\/value/key=\\1/", "~/.ssh/environment")
+        expect( Beaker::SedCommand ).to receive(:new).with("unix", "s/key=\\/my\\/first\\/value[;:]/key=/", "~/.ssh/environment")
         host.delete_env_var('key', '/my/first/value')
       end
 

data/spec/beaker/test_suite_spec.rb

@@ -226,6 +226,29 @@ module Beaker
         expect( test_suite_result.elapsed_time ).to be == 111
       end
 
+      describe '#print_test_result' do
+        it 'prints the test result without the line number if no file path' do
+          tc = Beaker::TestCase.new( hosts, options[:logger], options)
+          ex = StandardError.new('failed')
+          allow(ex).to receive(:backtrace).and_return(['path_to_test_file.rb line 1 - blah'])
+          tc.instance_variable_set(:@exception, ex)
+          test_suite_result.add_test_case( tc )
+          expect(options[:logger]).to_not receive(:notify).with(/Test line:/)
+          expect{ test_suite_result.print_test_result(tc) }.to_not raise_error
+        end
+
+        it 'prints the test result and line number from test case file on failure' do
+          tc = Beaker::TestCase.new( hosts, options[:logger], options, 'path_to_test_file.rb')
+          ex = StandardError.new('failed')
+          allow(ex).to receive(:backtrace).and_return(['path_to_test_file.rb line 1 - blah'])
+          tc.instance_variable_set(:@exception, ex)
+          test_suite_result.add_test_case( tc )
+
+          expect(options[:logger]).to receive(:notify).with(/Test line:/)
+          expect{ test_suite_result.print_test_result(tc) }.to_not raise_error
+        end
+      end
+
       describe '#write_junit_xml' do
         let(:options) { make_opts.merge({:logger => double().as_null_object,
                                          'name' => create_files(@files),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.47.1
+  version: 2.48.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,62 +108,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -409,7 +353,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -584,6 +528,7 @@ files:
 - 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/archive_file_from_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
@@ -612,54 +557,57 @@ files:
 - acceptance/tests/base/packages_unix.rb
 - acceptance/tests/base/test_suite/export.rb
 - acceptance/tests/hypervisor/communication_test.rb
+- acceptance/tests/install/from_file.rb
 - acceptance/tests/load_path_bootstrap.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke_test.rb
+- acceptance/tests/puppet/stub_host.rb
 - acceptance/tests/puppet/web_helpers_test.rb
 - acceptance/tests/puppet/with_puppet_running_on.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-Libraries.md
-- docs/Beaker-Recipes.md
-- docs/Beaker-Test-Tagging.md
-- docs/Beaker-with-Masterless-Puppet.md
-- docs/Creating-A-Test-Environment.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/README.md
-- docs/Roles-What-Are-They.md
-- docs/Shared-Options-for-Executing-Beaker-Commands.md
-- docs/The-Beaker-DSL.md
-- docs/The-Command-Line.md
-- docs/Types,-Puppet-4,-and-the-All-In-One-Agent.md
-- docs/beaker-vs.-beaker-rspec.md
-- docs/dsl/confine.md
-- docs/dsl/platform_specific_tag_confines.md
-- docs/hosts/README.md
-- docs/hosts/cisco.md
-- docs/hosts/eos.md
+- docs/concepts/argument_processing_and_precedence.md
+- docs/concepts/beaker_libraries.md
+- docs/concepts/beaker_vs_beaker_rspec.md
+- docs/concepts/masterless_puppet.md
+- docs/concepts/roles_what_are_they.md
+- docs/concepts/shared_options_for_executing_beaker_commands.md
+- docs/concepts/test_tagging.md
+- docs/concepts/ticket_process.md
+- docs/concepts/types_puppet_4_and_the_all_in_one_agent.md
+- docs/how_to/access_the_live_test_console_with_pry.md
 - docs/how_to/change_terminal_output_coloring.md
-- docs/hypervisors/README.md
-- docs/hypervisors/aws.md
-- docs/hypervisors/docker.md
-- docs/hypervisors/ec2.md
-- docs/hypervisors/google_compute_engine.md
-- docs/hypervisors/openstack.md
-- docs/hypervisors/solaris.md
-- docs/hypervisors/vagrant.md
-- docs/hypervisors/vagrant_hosts_file_examples.md
-- docs/hypervisors/vmware_fusion.md
-- docs/hypervisors/vsphere.md
-- docs/meta/README.md
-- docs/meta/ticket_process.md
-- docs/runner/run_in_parallel.md
-- docs/runner/test_run.md
-- docs/runner/test_suites.md
+- docs/how_to/confine.md
+- docs/how_to/hosts/README.md
+- docs/how_to/hosts/cisco.md
+- docs/how_to/hosts/eos.md
+- docs/how_to/hypervisors/README.md
+- docs/how_to/hypervisors/aws.md
+- docs/how_to/hypervisors/docker.md
+- docs/how_to/hypervisors/ec2.md
+- docs/how_to/hypervisors/google_compute_engine.md
+- docs/how_to/hypervisors/openstack.md
+- docs/how_to/hypervisors/solaris.md
+- docs/how_to/hypervisors/vagrant.md
+- docs/how_to/hypervisors/vagrant_hosts_file_examples.md
+- docs/how_to/hypervisors/vmware_fusion.md
+- docs/how_to/hypervisors/vsphere.md
+- docs/how_to/platform_specific_tag_confines.md
+- docs/how_to/preserve_hosts.md
+- docs/how_to/rake_tasks.md
+- docs/how_to/recipes.md
+- docs/how_to/run_in_parallel.md
+- docs/how_to/the_beaker_dsl.md
+- docs/how_to/use_user_password_authentication.md
+- docs/how_to/write_a_beaker_test_for_a_module.md
+- docs/tutorials/creating_a_test_environment.md
+- docs/tutorials/how_to_beaker.md
+- docs/tutorials/installation.md
+- docs/tutorials/lets_write_a_test.md
+- docs/tutorials/test_run.md
+- docs/tutorials/test_suites.md
+- docs/tutorials/the_command_line.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
 - lib/beaker/cli.rb
@@ -886,4 +834,3 @@ signing_key:
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []
-has_rdoc: 

data/docs/How-To-Beaker.md

@@ -1,6 +0,0 @@
-* [Beaker Installation](Beaker-Installation.md)
-* [Creating A Test Environment](Creating-A-Test-Environment.md)
-* [The Command Line](The-Command-Line.md)
-* [The Beaker DSL](The-Beaker-DSL.md)
-* [Let's Write a Test!](Lets-Write-a-Test.md)
-* [Access The Live Test Console with Pry](Access-the-Live-Test-Console-with-Pry.md)

data/docs/meta/README.md

@@ -1,6 +0,0 @@
-The meta folder contains docs not about how to **use** Beaker, but how to
-deal with Beaker in other ways, such as how to **change** it.
-
-**Table of Contents**
-
-- [Ticket Process](ticket_process.md)