beaker 2.14.1 → 2.15.0

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",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure"]}
-      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, :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", :configure => 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", "--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",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6"]}
+      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, :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", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6"}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}

data/spec/beaker/options/parser_spec.rb

@@ -137,7 +137,7 @@ module Beaker
         end
       end
 
-      describe 'parse_args' do
+      describe '#parse_args' do
         before { FakeFS.deactivate! }
 
         it 'pulls the args into key called :command_line' do
@@ -145,6 +145,72 @@ module Beaker
           expect(parser.parse_args( my_args )[:command_line]).to include(my_args.join(' '))
         end
 
+        describe 'does prioritization correctly' do
+          let(:env)       { @env || {:level => 'highest'} }
+          let(:argv)      { @argv || {:level => 'second'} }
+          let(:host_file) { @host_file || {:level => 'third'} }
+          let(:opt_file)  { @opt_file || {:level => 'fourth' } }
+          let(:presets)   { {:level => 'lowest' } }
+
+          before :each do
+            expect(parser).to receive( :normalize_args ).and_return( true )
+          end
+
+          def mock_out_parsing
+            presets_obj = double()
+            allow( presets_obj ).to receive( :presets ).and_return( presets )
+            allow( presets_obj ).to receive( :env_vars ).and_return( env )
+            parser.instance_variable_set( :@presets, presets_obj )
+
+            command_line_parser_obj = double()
+            allow( command_line_parser_obj ).to receive( :parse ).and_return( argv )
+            parser.instance_variable_set( :@command_line_parser, command_line_parser_obj )
+
+            allow( OptionsFileParser ).to receive( :parse_options_file ).and_return( opt_file )
+            allow( HostsFileParser ).to receive( :parse_hosts_file ).and_return( host_file )
+          end
+
+          it 'presets have the lowest priority' do
+            @env = @argv = @host_file = @opt_file = {}
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            expect( opts[:level] ).to be == 'lowest'
+          end
+
+          it 'options file has fourth priority' do
+            @env = @argv = @host_file = {}
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            expect( opts[:level] ).to be == 'fourth'
+          end
+
+          it 'host file CONFIG section has third priority' do
+            @env = @argv = {}
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            expect( opts[:level] ).to be == 'third'
+          end
+
+          it 'command line arguments have second priority' do
+            @env = {}
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            expect( opts[:level] ).to be == 'second'
+          end
+
+          it 'env vars have highest priority' do
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            expect( opts[:level] ).to be == 'highest'
+          end
+
+        end
+
         it "can correctly combine arguments from different sources" do
           build_url = 'http://my.build.url/'
           type = 'git'
@@ -277,6 +343,65 @@ module Beaker
         end
 
       end
+
+      describe '#normalize_and_validate_tags' do
+        let ( :tag_includes ) { @tag_includes || [] }
+        let ( :tag_excludes ) { @tag_excludes || [] }
+        let ( :options )      {
+          opts = Beaker::Options::OptionsHash.new
+          opts[:tag_includes] = tag_includes
+          opts[:tag_excludes] = tag_excludes
+          opts
+        }
+
+        it 'does not error if no tags overlap' do
+          @tag_includes = 'can,tommies,potatoes,plant'
+          @tag_excludes = 'joey,long_running,pants'
+          parser.instance_variable_set(:@options, options)
+
+          expect( parser ).to_not receive( :parser_error )
+          parser.normalize_and_validate_tags()
+        end
+
+        it 'does error if tags overlap' do
+          @tag_includes = 'can,tommies,should_error,potatoes,plant'
+          @tag_excludes = 'joey,long_running,pants,should_error'
+          parser.instance_variable_set(:@options, options)
+
+          expect( parser ).to receive( :parser_error )
+          parser.normalize_and_validate_tags()
+        end
+
+        it 'splits the basic case correctly' do
+          @tag_includes = 'can,tommies,potatoes,plant'
+          @tag_excludes = 'joey,long_running,pants'
+          parser.instance_variable_set(:@options, options)
+
+          parser.normalize_and_validate_tags()
+          expect( options[:tag_includes] ).to be === ['can', 'tommies', 'potatoes', 'plant']
+          expect( options[:tag_excludes] ).to be === ['joey', 'long_running', 'pants']
+        end
+
+        it 'returns empty arrays for empty strings' do
+          @tag_includes = ''
+          @tag_excludes = ''
+          parser.instance_variable_set(:@options, options)
+
+          parser.normalize_and_validate_tags()
+          expect( options[:tag_includes] ).to be === []
+          expect( options[:tag_excludes] ).to be === []
+        end
+
+        it 'lowercases all tags correctly for later use' do
+          @tag_includes = 'jeRRy_And_tOM,PARka'
+          @tag_excludes = 'lEet_spEAK,pOland'
+          parser.instance_variable_set(:@options, options)
+
+          parser.normalize_and_validate_tags()
+          expect( options[:tag_includes] ).to be === ['jerry_and_tom', 'parka']
+          expect( options[:tag_excludes] ).to be === ['leet_speak', 'poland']
+        end
+      end
     end
   end
 end

data/spec/beaker/shared/semvar_spec.rb

@@ -6,6 +6,18 @@ module Beaker
 
       describe 'version_is_less' do
 
+        it 'reports 2015.3.0-rc0-8-gf80879a is less than 2016' do
+          expect( subject.version_is_less( '2015.3.0-rc0-8-gf80879a', '2016' ) ).to be === true
+        end
+
+        it 'reports 2015.3.0-rc0-8-gf80879a is not less than 2015.3.0' do
+          expect( subject.version_is_less( '2015.3.0-rc0-8-gf80879a', '2015.3.0' ) ).to be === false
+        end
+
+        it 'reports 2015.3.0-rc0-8-gf80879a is not less than 3.0.0' do
+          expect( subject.version_is_less( '2015.3.0-rc0-8-gf80879a', '3.0.0' ) ).to be === false
+        end
+
         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
@@ -30,6 +42,37 @@ module Beaker
           expect( subject.version_is_less( '2.8', '2.9' ) ).to be === true
         end
       end
+
+      describe 'max_version' do
+
+        it 'returns nil if versions isn\'t defined' do
+          expect( subject.max_version(nil) ).to be_nil
+        end
+
+        it 'returns nil if versions is empty' do
+          expect( subject.max_version([]) ).to be_nil
+        end
+
+        it 'allows you to set the default, & will return it with faulty input' do
+          expect( subject.max_version([], '5.9') ).to be === '5.9'
+        end
+
+        it 'returns the one value if given a length 1 array' do
+          expect( subject.max_version(['7.3']) ).to be === '7.3'
+        end
+
+        it 'does not mangle the versions array passed in' do
+          first_array = ['1.4.3', '8.4.5', '3.5.7', '2.7.5']
+          array_to_pass = first_array.dup
+          subject.max_version(array_to_pass)
+          expect( array_to_pass ).to be === first_array
+        end
+
+        it 'returns 5.8.9 from [5.8.9, 1.2.3, 0.3.5, 5.7.11]' do
+          expect( subject.max_version(['5.8.9', '1.2.3', '0.3.5', '5.7.11']) ).to be === '5.8.9'
+        end
+
+      end
     end
 
   end

data/spec/beaker/test_suite_spec.rb

@@ -24,6 +24,27 @@ module Beaker
         expect(tfs).to include rb_test
       end
 
+      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)
+        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)
+        tfm = ts.instance_variable_get(:@fail_mode)
+        expect(tfm).to be == :fast
+      end
+
+      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)
+        tfm = ts.instance_variable_get(:@fail_mode)
+        expect(tfm).to be == :fast
+      end
     end
 
     context 'run' do

data/spec/helpers.rb

@@ -100,4 +100,8 @@ module HostHelpers
     hosts
   end
 
+  def make_instance instance_data = {}
+    OpenStruct.new instance_data
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.15.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -234,6 +234,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.9
+- !ruby/object:Gem::Dependency
+  name: open_uri_redirections
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -518,6 +532,7 @@ files:
 - spec/beaker/dsl/install_utils/module_utils_spec.rb
 - spec/beaker/dsl/install_utils/pe_defaults_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
@@ -525,7 +540,9 @@ files:
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb
+- spec/beaker/host/unix/exec_spec.rb
 - spec/beaker/host/unix/pkg_spec.rb
+- spec/beaker/host/windows/exec_spec.rb
 - spec/beaker/host/windows/group_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb