beaker 4.38.1 → 4.39.0

data/spec/beaker/subcommand_spec.rb

@@ -4,12 +4,12 @@ module Beaker
   SubcommandUtil = Beaker::Subcommands::SubcommandUtil
   describe Subcommand do
     let( :subcommand ) {
-      Beaker::Subcommand.new
+      described_class.new
     }
 
-    context '#initialize' do
+    describe '#initialize' do
       it 'creates a cli object' do
-        expect(subcommand.cli).to be
+        expect(subcommand.cli).to be_instance_of(Beaker::CLI)
       end
 
       describe 'File operation initialization for subcommands' do
@@ -33,7 +33,7 @@ module Beaker
 
     context 'ensure that beaker options can be passed through' do
 
-      let (:beaker_options_list) { [
+      let(:beaker_options_list) { [
         'options-file',
         'helper',
         'load-path',
@@ -78,7 +78,7 @@ module Beaker
 
       let( :yaml_store_mock ) { double('yaml_store_mock') }
 
-      it 'should not error with valid beaker options' do
+      it 'does not error with valid beaker options' do
         beaker_options_list.each do |option|
           allow_any_instance_of(Beaker::CLI).to receive(:parse_options)
           allow_any_instance_of(Beaker::CLI).to receive(:configured_options).and_return({})
@@ -91,27 +91,27 @@ module Beaker
           expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
           expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
 
-          expect {Beaker::Subcommand.start(['init', '--hosts', 'centos', "--#{option}"])}.to_not output(/ERROR/).to_stderr
+          expect {described_class.start(['init', '--hosts', 'centos', "--#{option}"])}.not_to output(/ERROR/).to_stderr
         end
       end
 
-      it "should error with a bad option here" do
+      it "errors with a bad option here" do
         allow(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
         allow(yaml_store_mock).to receive(:transaction).and_yield
         allow(yaml_store_mock).to receive(:[]=).with('provisioned', false)
         expect(File).not_to receive(:open)
         expect(SubcommandUtil::SUBCOMMAND_OPTIONS).to receive(:exist?).and_return(true)
         expect(SubcommandUtil::SUBCOMMAND_STATE).to receive(:exist?).and_return(true)
-        expect {Beaker::Subcommand.start(['init', '--hosts', 'centos', '--bad-option'])}.to output(/ERROR/).to_stderr
+        expect {described_class.start(['init', '--hosts', 'centos', '--bad-option'])}.to output(/ERROR/).to_stderr
       end
     end
 
-    context '#init' do
+    describe '#init' do
       let( :cli ) { subcommand.cli }
       let( :mock_options ) { {:timestamp => 'noon', :other_key => 'cordite'}}
       let( :yaml_store_mock ) { double('yaml_store_mock') }
 
-      before :each do
+      before do
         allow(cli).to receive(:parse_options)
         allow(cli).to receive(:configured_options).and_return(mock_options)
       end
@@ -130,17 +130,17 @@ module Beaker
       end
     end
 
-    context '#provision' do
-      let ( :cli ) { subcommand.cli }
+    describe '#provision' do
+      let( :cli ) { subcommand.cli }
       let( :yaml_store_mock ) { double('yaml_store_mock') }
-      let ( :host_hash ) { {'mynode.net' => {:name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64')}}}
-      let ( :cleaned_hosts ) {double()}
-      let ( :yielded_host_hash ) {double()}
-      let ( :yielded_host_name) {double()}
-      let ( :network_manager) {double('network_manager')}
-      let ( :hosts) {double('hosts')}
-      let ( :hypervisors) {double('hypervisors')}
-      let (:options) {double ('options')}
+      let( :host_hash ) { {'mynode.net' => {:name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64')}}}
+      let( :cleaned_hosts ) {double()}
+      let( :yielded_host_hash ) {double()}
+      let( :yielded_host_name) {double()}
+      let( :network_manager) {double('network_manager')}
+      let( :hosts) {double('hosts')}
+      let( :hypervisors) {double('hypervisors')}
+      let(:options) {double('options')}
 
       it 'provisions the host and saves the host info' do
         expect(YAML::Store).to receive(:new).with(SubcommandUtil::SUBCOMMAND_STATE).and_return(yaml_store_mock)
@@ -174,17 +174,21 @@ module Beaker
     end
 
     context 'exec' do
-      before :each do
+      before do
         allow(subcommand.cli).to receive(:parse_options)
         allow(subcommand.cli).to receive(:initialize_network_manager)
         allow(subcommand.cli).to receive(:execute!)
       end
 
+      let( :cleaned_hosts ) {double()}
+      let( :host_hash ) { {'mynode.net' => {:name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64')}}}
+      let( :yaml_store_mock ) { double('yaml_store_mock') }
+
       it 'calls execute! when no resource is given' do
-        expect_any_instance_of(Pathname).to_not receive(:directory?)
-        expect_any_instance_of(Pathname).to_not receive(:exist?)
+        expect_any_instance_of(Pathname).not_to receive(:directory?)
+        expect_any_instance_of(Pathname).not_to receive(:exist?)
         expect(subcommand.cli).to receive(:execute!).once
-        expect{subcommand.exec}.to_not raise_error
+        expect{subcommand.exec}.not_to raise_error
       end
 
       it 'allows hard coded suite names to be specified' do
@@ -251,9 +255,7 @@ module Beaker
       end
 
 
-      let( :yaml_store_mock ) { double('yaml_store_mock') }
-      let( :host_hash ) { {'mynode.net' => {:name => 'mynode', :platform => Beaker::Platform.new('centos-6-x86_64')}}}
-      let( :cleaned_hosts ) {double()}
+
       it 'updates the subcommand_options file with new host info if `preserve-state` is set' do
         allow(yaml_store_mock).to receive(:[]).and_return(false)
         allow(subcommand).to receive(:options).and_return('preserve-state' => true)
@@ -272,7 +274,7 @@ module Beaker
       it 'does not attempt preserve state if the flag is not passed in' do
         subcommand.exec('tests')
 
-        expect(SubcommandUtil).to receive(:sanitize_options_for_save).never
+        expect(SubcommandUtil).not_to receive(:sanitize_options_for_save)
         expect(subcommand.cli.options['preserve-state']).to be_nil
       end
     end

data/spec/beaker/test_case_spec.rb

@@ -4,7 +4,7 @@ module Beaker
   describe TestCase do
     let(:logger) {  double('logger').as_null_object }
     let(:path) { @path || '/tmp/nope' }
-    let(:testcase) { TestCase.new({}, logger, {}, path) }
+    let(:testcase) { described_class.new({}, logger, {}, path) }
 
     context 'run_test' do
       it 'defaults to test_status :pass on success' do
@@ -13,10 +13,9 @@ module Beaker
           f.write ""
         end
         @path = path
-        expect( testcase ).to_not receive( :log_and_fail_test )
+        expect( testcase ).not_to receive( :log_and_fail_test )
         testcase.run_test
-        status = testcase.instance_variable_get(:@test_status)
-        expect(status).to be === :pass
+        expect(testcase.test_status).to be === :pass
       end
 
       it 'updates test_status to :skip on SkipTest' do
@@ -25,10 +24,9 @@ module Beaker
           f.write "raise SkipTest"
         end
         @path = path
-        expect( testcase ).to_not receive( :log_and_fail_test )
+        expect( testcase ).not_to receive( :log_and_fail_test )
         testcase.run_test
-        status = testcase.instance_variable_get(:@test_status)
-        expect(status).to be === :skip
+        expect(testcase.test_status).to be === :skip
       end
 
       it 'updates test_status to :pending on PendingTest' do
@@ -37,10 +35,9 @@ module Beaker
           f.write "raise PendingTest"
         end
         @path = path
-        expect( testcase ).to_not receive( :log_and_fail_test )
+        expect( testcase ).not_to receive( :log_and_fail_test )
         testcase.run_test
-        status = testcase.instance_variable_get(:@test_status)
-        expect(status).to be === :pending
+        expect(testcase.test_status).to be === :pending
       end
 
       it 'updates test_status to :fail on FailTest' do
@@ -51,8 +48,7 @@ module Beaker
         @path = path
         expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Beaker::DSL::FailTest), :fail).and_call_original
         testcase.run_test
-        status = testcase.instance_variable_get(:@test_status)
-        expect(status).to be === :fail
+        expect(testcase.test_status).to be === :fail
       end
 
       it 'correctly handles RuntimeError' do
@@ -107,7 +103,7 @@ module Beaker
         @path = path
         expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :teardown_error).and_call_original
         testcase.run_test
-        expect @test_status == :error
+        expect(testcase.test_status).to eq(:error)
       end
 
       it 'does not overwrite a test failure if an assertion also happens in a teardown block' do
@@ -124,7 +120,7 @@ module Beaker
         expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :fail).and_call_original
         expect( testcase ).to receive( :log_and_fail_test ).once.with(kind_of(Minitest::Assertion), :teardown_error).and_call_original
         testcase.run_test
-        expect @test_status == :fail
+        expect(testcase.test_status).to eq(:fail)
       end
     end
 
@@ -148,7 +144,7 @@ module Beaker
         end
         @path = path
         # we have to create a TestCase by hand, so that we can set old
-        tc = TestCase.new({}, logger, {}, path)
+        tc = described_class.new({}, logger, {}, path)
         # metadata on it, so that we can test that it's being reset correctly
         old_metadata = { :step => { :name => 'CharlieBrown' } }
         tc.instance_variable_set(:@metadata, old_metadata)

data/spec/beaker/test_suite_spec.rb

@@ -13,12 +13,12 @@ module Beaker
       let(:sh_test)  { File.expand_path(test_dir + '/my_shell_file.sh')   }
 
       it 'fails without test files' do
-        expect { Beaker::TestSuite.new('name', 'hosts', Hash.new, Time.now, :stop_on_error) }.to raise_error
+        expect { described_class.new('name', 'hosts', Hash.new, Time.now, :stop_on_error) }.to raise_error
       end
 
       it 'includes specific files as test file when explicitly passed' do
         @files = [ rb_test ]
-        ts = Beaker::TestSuite.new('name', 'hosts', options, Time.now, :stop_on_error)
+        ts = described_class.new('name', 'hosts', options, Time.now, :stop_on_error)
 
         tfs = ts.instance_variable_get(:@test_files)
         expect(tfs).to include rb_test
@@ -26,14 +26,14 @@ module Beaker
 
       it 'defaults to :slow fail_mode if not provided through parameter or options' do
         @files = [ rb_test ]
-        ts = Beaker::TestSuite.new('name', 'hosts', options, Time.now)
+        ts = described_class.new('name', 'hosts', options, Time.now)
         tfm = ts.instance_variable_get(:@fail_mode)
         expect(tfm).to be == :slow
       end
 
       it 'uses provided parameter fail_mode' do
         @files = [ rb_test ]
-        ts = Beaker::TestSuite.new('name', 'hosts', options, Time.now, :fast)
+        ts = described_class.new('name', 'hosts', options, Time.now, :fast)
         tfm = ts.instance_variable_get(:@fail_mode)
         expect(tfm).to be == :fast
       end
@@ -41,7 +41,7 @@ module Beaker
       it 'uses options fail_mode if fail_mode parameter is not provided' do
         @files = [ rb_test ]
         options[:fail_mode] = :fast
-        ts = Beaker::TestSuite.new('name', 'hosts', options, Time.now)
+        ts = described_class.new('name', 'hosts', options, Time.now)
         tfm = ts.instance_variable_get(:@fail_mode)
         expect(tfm).to be == :fast
       end
@@ -65,7 +65,7 @@ module Beaker
         File.open(pl_test, 'w') { |file| file.write(okay_script) }
         File.open(sh_test, 'w') { |file| file.write(okay_script) }
 
-        ts = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :stop )
+        ts = described_class.new( 'name', hosts, options, Time.now, :stop )
         tsr = ts.instance_variable_get( :@test_suite_results )
         allow( tsr ).to receive(:write_junit_xml).and_return( true )
         allow( tsr ).to receive(:summarize).and_return( true )
@@ -85,7 +85,7 @@ module Beaker
         File.open(pl_test, 'w') { |file| file.write(okay_script) }
         File.open(sh_test, 'w') { |file| file.write(okay_script) }
 
-        ts = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :stop )
+        ts = described_class.new( 'name', hosts, options, Time.now, :stop )
         tsr = ts.instance_variable_get( :@test_suite_results )
         allow( tsr ).to receive(:write_junit_xml).and_return( true )
         allow( tsr ).to receive(:summarize).and_return( true )
@@ -105,7 +105,7 @@ module Beaker
         File.open(pl_test, 'w') { |file| file.write(fail_script) }
         File.open(sh_test, 'w') { |file| file.write(okay_script) }
 
-        ts = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :slow )
+        ts = described_class.new( 'name', hosts, options, Time.now, :slow )
         tsr = ts.instance_variable_get( :@test_suite_results )
         allow( tsr ).to receive(:write_junit_xml).and_return( true )
         allow( tsr ).to receive(:summarize).and_return( true )
@@ -126,7 +126,7 @@ module Beaker
       let( :testcase1 )         { Beaker::TestCase.new( hosts, options[:logger], options) }
       let( :testcase2 )         { Beaker::TestCase.new( hosts, options[:logger], options) }
       let( :testcase3 )         { Beaker::TestCase.new( hosts, options[:logger], options) }
-      let( :test_suite_result ) { TestSuiteResult.new( options, "my_suite") }
+      let( :test_suite_result ) { described_class.new( options, "my_suite") }
 
       it 'supports adding test cases' do
         expect( test_suite_result.test_count ).to be === 0
@@ -232,7 +232,7 @@ module Beaker
           tc.instance_variable_set(:@exception, ex)
           test_suite_result.add_test_case( tc )
           expect(test_suite_result.print_test_result(tc)).not_to match(/Test line:/)
-          expect{ test_suite_result.print_test_result(tc) }.to_not raise_error
+          expect{ test_suite_result.print_test_result(tc) }.not_to raise_error
         end
 
         it 'prints the test result and line number from test case file on failure' do
@@ -242,7 +242,7 @@ module Beaker
           tc.instance_variable_set(:@exception, ex)
           test_suite_result.add_test_case( tc )
           expect(test_suite_result.print_test_result(tc)).to match(/Test line:/)
-          expect{ test_suite_result.print_test_result(tc) }.to_not raise_error
+          expect{ test_suite_result.print_test_result(tc) }.not_to raise_error
         end
       end
 
@@ -253,14 +253,14 @@ module Beaker
                                          :xml_dated_dir => '.'}) }
         let(:rb_test) { 'my_ruby_file.rb' }
 
-        before(:each) do
+        before do
           @files = [ rb_test, rb_test, rb_test]
           @ts    = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :fast )
           @tsr   = @ts.instance_variable_get( :@test_suite_results )
           allow( @tsr ).to receive( :start_time ).and_return(0)
           allow( @tsr ).to receive( :stop_time ).and_return(10)
           @test_cases = []
-          @files.each_with_index do |file, index|
+          @files.each_with_index do |_file, _index|
             tc = Beaker::TestCase.new( hosts, options[:logger], options, rb_test)
             allow( tc ).to receive( :sublog ).and_return( false )
             @test_cases << tc
@@ -271,7 +271,7 @@ module Beaker
         end
 
         it 'doesn\'t re-order test cases themselves on time_sort' do
-          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          expect( @tsr.instance_variable_get( :@logger ) ).not_to receive( :error )
 
           @test_cases.each_with_index do |tc,index|
             tc.instance_variable_set(:@runtime, 3**index)
@@ -286,7 +286,7 @@ module Beaker
         end
 
         it 'writes @export nested hashes properly' do
-          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          expect( @tsr.instance_variable_get( :@logger ) ).not_to receive( :error )
           inner_value = {'second' => '2nd'}
           @test_cases.each do |tc|
             tc.instance_variable_set(:@runtime, 0)
@@ -301,7 +301,7 @@ module Beaker
         end
 
         it 'writes @export array of hashes properly' do
-          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          expect( @tsr.instance_variable_get( :@logger ) ).not_to receive( :error )
           @test_cases.each do |tc|
             tc.instance_variable_set(:@runtime, 0)
             tc.instance_variable_set(:@exports, [{:yes => 'hello'}, {:uh => 'sher'}])
@@ -315,7 +315,7 @@ module Beaker
         end
 
         it 'writes @export hashes per test case properly' do
-          expect( @tsr.instance_variable_get( :@logger ) ).to receive( :error ).never
+          expect( @tsr.instance_variable_get( :@logger ) ).not_to receive( :error )
           @test_cases.each_with_index do |tc,index|
             tc.instance_variable_set(:@runtime, 0)
             tc.instance_variable_set(:@exports, [{"yes_#{index}" => "hello#{index}"}])
@@ -337,7 +337,7 @@ module Beaker
       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 ) }
+      let( :testsuite ) { described_class.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'
@@ -347,15 +347,15 @@ module Beaker
         # 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
+          expect( File ).not_to be_symlink('man/latest')
           testsuite.log_path('foo.txt', 'man/date')
-          expect( File.symlink?('man/latest') ).to be_truthy
+          expect( File ).to be_symlink('man/latest')
         end
 
         it 'if given a nested directory' do
-          expect( File.symlink?('a/latest') ).to be_falsy
+          expect( File ).not_to be_symlink('a/latest')
           testsuite.log_path('foo.txt', 'a/b/c/d/e/f')
-          expect( File.symlink?('a/latest') ).to be_truthy
+          expect( File ).to be_symlink('a/latest')
         end
       end
 
@@ -363,13 +363,13 @@ module Beaker
         # the symlink directory is where the symlink points to
 
         it 'in the usual case' do
-          expect( File.symlink?('d/latest') ).to be_falsy
+          expect( File ).not_to be_symlink('d/latest')
           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
+          expect( File ).not_to be_symlink('f/latest')
           testsuite.log_path('foo.txt', 'f/g/h/i/j/k')
           expect( File.readlink('f/latest') ).to be === 'g/h/i/j/k'
         end

data/spec/matchers.rb

@@ -53,7 +53,7 @@ RSpec::Matchers.define :execute_commands_matching_in_order do |*patterns|
   end
 
   def message(actual, patterns)
-    msg = "#{patterns.join(', ')} in order" +
+    "#{patterns.join(', ')} in order" +
       " in:\n #{actual.command_strings.pretty_inspect}"
   end
 

data/spec/mocks.rb

@@ -26,7 +26,7 @@ module MockNet
         @uri = uri
       end
 
-      def body= *args
+      def body= *_args
         hash
       end
     end
@@ -36,7 +36,7 @@ module MockNet
         @uri = uri
       end
 
-      def body= *args
+      def body= *_args
         hash
       end
     end
@@ -52,7 +52,7 @@ module MockNet
       @port = port
     end
 
-    def request req
+    def request _req
       Response.new
     end
   end
@@ -80,7 +80,7 @@ module FakeHost
 
     attr_accessor :commands
 
-    def port_open?(port)
+    def port_open?(_port)
       true
     end
 
@@ -88,7 +88,7 @@ module FakeHost
       RSpec::Mocks::Double.new('exec-result').as_null_object
     end
 
-    def exec(command, options = {})
+    def exec(command, _options = {})
       commands << command
       any_exec_result
     end

data/spec/spec_helper.rb

@@ -27,9 +27,6 @@ require 'fakefs/spec_helpers'
 require 'mocks'
 require 'helpers'
 require 'matchers'
-require 'mock_fission'
-require 'mock_vsphere'
-require 'mock_vsphere_helper'
 require 'rspec/its'
 
 RSpec.configure do |config|