beaker 1.16.0 → 1.17.0

data/spec/beaker/perf_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+module Beaker
+  describe Perf do
+
+    context "When a Perf object is created" do
+      it 'creates a new Perf object' do
+        hosts = Array.new
+        options = Hash.new
+        options[:log_level] = :debug
+        my_logger = Beaker::Logger.new(options)
+        options[:logger] = my_logger
+        perf = Perf.new( hosts, options )
+        expect( perf ).to be_a_kind_of Perf
+      end
+
+      before(:each) do
+        @options = make_opts
+        @options[:collect_perf_data] = true
+        @options[:log_level] = :debug
+        @options[:color] = false
+        @my_io = StringIO.new
+        @my_logger = Beaker::Logger.new(@options)
+        @my_logger.add_destination(@my_io)
+        @options[:logger] = @my_logger
+      end
+
+      it 'creates a new Perf object with a single host, :collect_perf_data = true' do
+        hosts = [ make_host("myHost", @options) ]
+        @my_logger.remove_destination(STDOUT)
+        perf = Perf.new( hosts, @options )
+        expect( perf ).to be_a_kind_of Perf
+        expect(@my_io.string).to match(/Setup perf on host: myHost/)
+      end
+
+      it 'creates a new Perf object with multiple hosts, :collect_perf_data = true' do
+        hosts = [ make_host("myHost", @options), make_host("myOtherHost", @options) ]
+        @my_logger.remove_destination(STDOUT)
+        perf = Perf.new( hosts, @options )
+        expect( perf ).to be_a_kind_of Perf
+        expect(@my_io.string).to match(/Setup perf on host: myHost*Setup perf on host: myOtherHost/)
+      end
+
+      it 'creates a new Perf object with multiple hosts, :collect_perf_data = true, SLES' do
+        hosts = [ make_host("myHost", @options), make_host("myOtherHost", @options) ]
+        hosts[0]['platform'] = "SLES"
+        @my_logger.remove_destination(STDOUT)
+        perf = Perf.new( hosts, @options )
+        expect( perf ).to be_a_kind_of Perf
+        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHost/)
+      end
+    end
+
+    context "When testing is finished, :collect_perf_data = true" do
+      before(:each) do
+        @options = make_opts
+        @options[:collect_perf_data] = true
+        @options[:log_level] = :debug
+        @options[:color] = false
+        @hosts = [ make_host("myHost", @options), make_host("myOtherHost", @options) ]
+        @my_io = StringIO.new
+        @my_logger = Beaker::Logger.new(@options)
+        @my_logger.add_destination(@my_io)
+        @options[:logger] = @my_logger
+      end
+
+      it "Does the Right Thing on Linux hosts" do
+        @hosts[0]['platform'] = "centos"
+        @my_logger.remove_destination(STDOUT)
+        perf = Perf.new( @hosts, @options )
+        expect( perf ).to be_a_kind_of Perf
+        perf.print_perf_info
+        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHost/)
+      end
+
+      it "Does the Right Thing on non-Linux hosts" do
+        @hosts[0]['platform'] = "windows"
+        @my_logger.remove_destination(STDOUT)
+        perf = Perf.new( @hosts, @options )
+        expect( perf ).to be_a_kind_of Perf
+        perf.print_perf_info
+        expect(@my_io.string).to match(/Setup perf on host: myHostSetup perf on host: myOtherHostGetting perf data for host: myHostGetting perf data for host: myOtherHost/)
+      end
+    end
+
+  end
+end

data/spec/beaker/shared/{host_role_parser_spec.rb → host_manager_spec.rb}

@@ -2,13 +2,17 @@ require 'spec_helper'
 
 module Beaker
   module Shared
-    describe HostRoleParser do
-      let( :host_handler )   { Beaker::Shared::HostRoleParser }
+    describe HostManager do
+      let( :host_handler )   { Beaker::Shared::HostManager }
+      let( :spec_block )     { Proc.new { |arr| arr } }
       let( :platform )       { @platform || 'unix' }
+      let( :role0 )          { "role0" }
+      let( :role1 )          { :role1 }
+      let( :role2 )          { :role2 }
       let( :hosts )          { hosts = make_hosts( { :platform => platform } )
-                               hosts[0][:roles] = ['agent']
-                               hosts[1][:roles] = ['master', 'dashboard', 'agent', 'database']
-                               hosts[2][:roles] = ['agent']
+                               hosts[0][:roles] = ['agent', role0]
+                               hosts[1][:roles] = ['master', 'dashboard', 'agent', 'database', role1]
+                               hosts[2][:roles] = ['agent', role2]
                                hosts }
 
       context "hosts_with_role" do
@@ -52,6 +56,33 @@ module Beaker
         end
       end
 
+      context "run_block_on" do
+        it "can execute a block against hosts identified by a string" do
+          myhosts = host_handler.run_block_on( hosts, role0 ) do |hosts|
+            hosts
+          end
+          expect( myhosts ).to be  === hosts[0]
+
+        end
+
+        it "can execute a block against hosts identified by a hostname" do
+          myhosts = host_handler.run_block_on( hosts, hosts[0].name ) do |hosts|
+            hosts
+          end
+          expect( myhosts ).to be  === hosts[0]
+
+        end
+
+        it "can execute a block against an array of hosts" do
+          myhosts = host_handler.run_block_on( hosts ) do |hosts|
+            hosts
+          end
+          expect( myhosts ).to be  === hosts
+
+        end
+
+      end
+
     end
 
   end

data/spec/beaker/test_suite_spec.rb

@@ -35,6 +35,7 @@ module Beaker
       let(:rb_test)       { 'my_ruby_file.rb'     }
       let(:pl_test)       { '/my_perl_file.pl'    }
       let(:sh_test)       { '/my_shell_file.sh'   }
+      let(:hosts)         { make_hosts() }
 
       it 'fails fast if fail_mode != :slow and runtime error is raised' do
         Logger.stub('new')
@@ -43,7 +44,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 = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :stop )
         tsr = ts.instance_variable_get( :@test_suite_results )
         tsr.stub(:write_junit_xml).and_return( true )
         tsr.stub(:summarize).and_return( true )
@@ -63,7 +64,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 = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :stop )
         tsr = ts.instance_variable_get( :@test_suite_results )
         tsr.stub(:write_junit_xml).and_return( true )
         tsr.stub(:summarize).and_return( true )
@@ -83,7 +84,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 = Beaker::TestSuite.new( 'name', hosts, options, Time.now, :slow )
         tsr = ts.instance_variable_get( :@test_suite_results )
         tsr.stub(:write_junit_xml).and_return( true )
         tsr.stub(:summarize).and_return( true )

data/spec/matchers.rb

@@ -1,7 +1,6 @@
 RSpec::Matchers.define :execute_commands_matching do |pattern|
-
   match do |actual|
-    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.kind_of?(FakeHost)
+    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.kind_of?(FakeHost::MockedExec)
     @found_count = actual.command_strings.grep(pattern).size
     @times.nil? ?
       @found_count > 0 :
@@ -18,7 +17,6 @@ RSpec::Matchers.define :execute_commands_matching do |pattern|
 
   chain :once do
     @times = 1
-    # clarity only
   end
 
   def message(actual, pattern, times, found_count)
@@ -37,3 +35,33 @@ RSpec::Matchers.define :execute_commands_matching do |pattern|
     "Unexpectedly found #{message(actual, pattern, @times, @found_count)}"
   end
 end
+
+RSpec::Matchers.define :execute_commands_matching_in_order do |*patterns|
+  match do |actual|
+    raise(RuntimeError, "Expected #{actual} to be a FakeHost") unless actual.kind_of?(FakeHost::MockedExec)
+
+    remaining_patterns = patterns.clone
+    actual.command_strings.each do |line|
+      if remaining_patterns.empty?
+        break
+      elsif remaining_patterns.first.match(line)
+        remaining_patterns.shift
+      end
+    end
+
+    remaining_patterns.empty?
+  end
+
+  def message(actual, patterns)
+    msg = "#{patterns.join(', ')} in order" +
+      " in:\n #{actual.command_strings.pretty_inspect}"
+  end
+
+  failure_message_for_should do |actual|
+    "Expected to find #{message(actual, patterns)}"
+  end
+
+  failure_message_for_should_not do |actual|
+    "Unexpectedly found #{message(actual, patterns)}"
+  end
+end

data/spec/mocks.rb

@@ -43,7 +43,7 @@ module MockNet
         @uri = uri
       end
     end
-    
+
     def initialize host, port
       @host = host
       @port = port
@@ -56,37 +56,43 @@ module MockNet
 
 end
 
-class FakeHost
-  attr_accessor :commands
-
-  def initialize(options = {})
-    @pe = options[:pe]
-    @options = options[:options]
-    @commands = []
+module FakeHost
+  def self.create(name = 'fakevm', platform = 'redhat-version-arch', options = {})
+    options_hash = Beaker::Options::OptionsHash.new.merge(options)
+    options_hash['HOSTS'] = { name => { 'platform' => Beaker::Platform.new(platform) } }
+    host = Beaker::Host.create(name, options_hash)
+    host.extend(MockedExec)
+    host
   end
 
-  def port_open?(port)
-    true
-  end
+  module MockedExec
+    def self.extended(other)
+      other.instance_eval do
+        send(:instance_variable_set, :@commands, [])
+      end
+    end
 
-  def is_pe?
-    @pe
-  end
+    attr_accessor :commands
 
-  def [](name)
-    @options[name]
-  end
+    def port_open?(port)
+      true
+    end
 
-  def any_exec_result
-    RSpec::Mocks::Mock.new('exec-result').as_null_object
-  end
+    def any_exec_result
+      RSpec::Mocks::Mock.new('exec-result').as_null_object
+    end
 
-  def exec(command, options = {})
-    commands << command
-    any_exec_result
+    def exec(command, options = {})
+      commands << command
+      any_exec_result
+    end
+
+    def command_strings
+      commands.map { |c| [c.command, c.args].join(' ') }
+    end
   end
 
-  def command_strings
-    commands.map { |c| [c.command, c.args].join(' ') }
+  def log_prefix
+    "FakeHost"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: hocon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +358,7 @@ files:
 - .rspec
 - .simplecov
 - .travis.yml
+- CONTRIBUTING.md
 - DOCUMENTING.md
 - Gemfile
 - HISTORY.md
@@ -369,6 +384,7 @@ files:
 - lib/beaker/dsl/helpers.rb
 - lib/beaker/dsl/install_utils.rb
 - lib/beaker/dsl/outcomes.rb
+- lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
 - lib/beaker/dsl/structure.rb
 - lib/beaker/dsl/wrappers.rb
@@ -417,11 +433,12 @@ files:
 - lib/beaker/options/parser.rb
 - lib/beaker/options/pe_version_scraper.rb
 - lib/beaker/options/presets.rb
+- lib/beaker/perf.rb
 - lib/beaker/platform.rb
 - lib/beaker/result.rb
 - lib/beaker/shared.rb
 - lib/beaker/shared/error_handler.rb
-- lib/beaker/shared/host_role_parser.rb
+- lib/beaker/shared/host_manager.rb
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
@@ -470,10 +487,11 @@ files:
 - spec/beaker/options/parser_spec.rb
 - spec/beaker/options/pe_version_scaper_spec.rb
 - spec/beaker/options/presets_spec.rb
+- spec/beaker/perf_spec.rb
 - spec/beaker/platform_spec.rb
 - spec/beaker/puppet_command_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
-- spec/beaker/shared/host_role_parser_spec.rb
+- spec/beaker/shared/host_manager_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb
@@ -551,10 +569,11 @@ test_files:
 - spec/beaker/options/parser_spec.rb
 - spec/beaker/options/pe_version_scaper_spec.rb
 - spec/beaker/options/presets_spec.rb
+- spec/beaker/perf_spec.rb
 - spec/beaker/platform_spec.rb
 - spec/beaker/puppet_command_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
-- spec/beaker/shared/host_role_parser_spec.rb
+- spec/beaker/shared/host_manager_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb

data/lib/beaker/shared/host_role_parser.rb

@@ -1,36 +0,0 @@
-module Beaker
-  module Shared
-    #Methods for selecting host or hosts that match roles.
-    module HostRoleParser
-
-      #Find hosts from a given array of hosts that all have the desired role.
-      #@param [Array<Host>] hosts The hosts to examine
-      #@param [String] desired_role The hosts returned will have this role in their roles list
-      #@return [Array<Host>] The hosts that have the desired role in their roles list
-      def hosts_with_role(hosts, desired_role = nil)
-        hosts.select do |host|
-          desired_role.nil? or host['roles'].include?(desired_role.to_s)
-        end
-      end
-
-      #Find a single host with the role provided.  Raise an error if more than one host is found to have the
-      #provided role.
-      #@param [Array<Host>] hosts The hosts to examine
-      #@param [String] role The host returned will have this role in its role list
-      #@return [Host] The single host with the desired role in its roles list
-      #@raise [ArgumentError] Raised if more than one host has the given role defined, or if no host has the
-      #                       role defined.
-      def only_host_with_role(hosts, role)
-        a_host = hosts_with_role(hosts, role)
-        case
-          when a_host.length == 0
-            raise ArgumentError, "There should be one host with #{role} defined!"
-          when a_host.length > 1
-            host_string = ( a_host.map { |host| host.name } ).join( ', ')
-            raise ArgumentError, "There should be only one host with #{role} defined, but I found #{a_host.length} (#{host_string})"
-        end
-        a_host.first
-      end
-    end
-  end
-end