beaker 1.21.0 → 2.0.0

data/lib/beaker/perf.rb

@@ -4,8 +4,8 @@ module Beaker
 
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
-    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|sles/
-    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el/
+    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
+    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
 
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
     # was used as an option on the Baker command line invocation. Instances of this class do not
@@ -39,7 +39,7 @@ module Beaker
         @logger.perf_output("Perf (sysstat) not supported on host: " + host)
       end
 
-      if host['platform'] =~ /debian|ubuntu/
+      if host['platform'] =~ /debian|ubuntu|cumulus/
         @logger.perf_output("Modify /etc/default/sysstat on Debian and Ubuntu platforms")
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
       elsif host['platform'] =~ /sles/
@@ -52,7 +52,6 @@ module Beaker
     end
 
     # Iterate over all hosts, calling get_perf_data
-    # @param [void]
     # @return [void]
     def print_perf_info()
       @perf_end_timestamp = Time.now

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
+    PLATFORMS = /^(osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
 
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
@@ -48,6 +48,7 @@ module Beaker
     # * solaris
     # * aix
     # * el
+    # * cumulus
     def initialize(name)
       if name !~ PLATFORMS
         raise ArgumentError, "Unsupported platform name #{name}"

data/lib/beaker/result.rb

@@ -31,15 +31,9 @@ module Beaker
     end
 
     def convert string
-      if string.respond_to?( :force_encoding )
-        # We're running in >= 1.9 and we'll need to convert
-        # Remove invalid and undefined UTF-8 character encodings
-        string.force_encoding('UTF-8')
-        return string.chars.select{|i| i.valid_encoding?}.join
-      else
-        # We're running in < 1.9 and Ruby doesn't care
-        return string
-      end
+      # Remove invalid and undefined UTF-8 character encodings
+      string.force_encoding('UTF-8')
+      string.chars.select{|i| i.valid_encoding?}.join
     end
 
     def log(logger)

data/lib/beaker/ssh_connection.rb

@@ -25,6 +25,7 @@ module Beaker
       @user = user
       @ssh_opts = ssh_opts
       @logger = options[:logger]
+      @options = options
     end
 
     def self.connect hostname, user = 'root', ssh_opts = {}, options = {}
@@ -57,6 +58,7 @@ module Beaker
       self
     end
 
+    # closes this SshConnection
     def close
       begin
         @ssh.close if @ssh

data/lib/beaker/test_case.rb

@@ -6,18 +6,6 @@ require 'tempfile'
 require 'benchmark'
 require 'stringio'
 require 'rbconfig'
-#include test/unit, but do not allow it to autorun on exit
-require 'test/unit'
-if defined?(Test::Unit::AutoRunner.need_auto_run?)
-  # For test-unit gem >= 2.4.9
-  Test::Unit::AutoRunner.need_auto_run = false
-elsif defined?(Test::Unit.run?)
-  # For test-unit gem < 2.4.9
-  Test::Unit.run = true
-elsif defined?(Test::Unit::Runner)
-  # For test/unit bundled in Ruby >= 1.9.3
-  Test::Unit::Runner.module_eval("@@stop_auto_run = true")
-end
 
 module Beaker
   # This class represents a single test case. A test case is necessarily
@@ -33,15 +21,8 @@ module Beaker
   class TestCase
     include Beaker::DSL
 
-    rb_config_class = defined?(RbConfig) ? RbConfig : Config
-    if rb_config_class::CONFIG['MAJOR'].to_i == 1 &&
-      rb_config_class::CONFIG['MINOR'].to_i == 8 then
-      # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.8)
-      TEST_EXCEPTION_CLASS = Test::Unit::AssertionFailedError
-    else
-      # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.9)
-      TEST_EXCEPTION_CLASS = ::MiniTest::Assertion
-    end
+    # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.9)
+    TEST_EXCEPTION_CLASS = ::MiniTest::Assertion
 
     # Necessary for implementing {Beaker::DSL::Helpers#confine}.
     # Assumed to be an array of valid {Beaker::Host} objects for

data/lib/beaker/test_suite.rb

@@ -341,7 +341,7 @@ module Beaker
       start_time = Time.now
 
       #Create a run log for this TestSuite.
-      run_log = log_path(@timestamp, "#{@name}-run.log", @options[:log_dir])
+      run_log = log_path("#{@name}-run.log", @options[:log_dated_dir])
       @logger.add_destination(run_log)
 
       # This is an awful hack to maintain backward compatibility until tests
@@ -379,8 +379,8 @@ module Beaker
       # REVISIT: This changes global state, breaking logging in any future runs
       # of the suite – or, at least, making them highly confusing for anyone who
       # has not studied the implementation in detail. --daniel 2011-03-14
-      @test_suite_results.summarize( Logger.new(log_path(@timestamp, "#{name}-summary.txt", @options[:log_dir]), STDOUT) )
-      @test_suite_results.write_junit_xml( log_path(@timestamp, @options[:xml_file], @options[:xml_dir]), File.join(@options[:project_root], @options[:xml_stylesheet]) )
+      @test_suite_results.summarize( Logger.new(log_path("#{name}-summary.txt", @options[:log_dated_dir]), STDOUT) )
+      @test_suite_results.write_junit_xml( log_path(@options[:xml_file], @options[:xml_dated_dir]), File.join(@options[:project_root], @options[:xml_stylesheet]) )
 
       #All done with this run, remove run log
       @logger.remove_destination(run_log)
@@ -404,32 +404,28 @@ module Beaker
       end
     end
 
-    #Create a full file path for output to be written to, using the provided timestamp, name and output directory.
-    #@param [Time] timestamp The time that we are making this path with
-    #@param [String] name The file name that we want to write to.
-    #@param [String] basedir The desired output directory.  A subdirectory tagged with the time will be created which will contain
-    #                        the output file (./basedir/timestamp/).  
-    #                        A symlink will be made from that to ./basedir/timestamp/latest.
-    #@example
-    #  log_path('2014-06-02 16:31:22 -0700','output.txt', 'log')
+    # Gives a full file path for output to be written to, maintaining the latest symlink
+    # @param [String] name The file name that we want to write to.
+    # @param [String] log_dir The desired output directory.
+    #                         A symlink will be made from ./parentdir/latest to that.
+    # @example
+    #   log_path('output.txt', 'log/2014-06-02_16_31_22')
     #
-    #    This will create the structure:
+    #     This will create the structure:
     #
-    #  ./log/2014-06-02_16_31_22/output.txt
-    #  ./log/latest -> 2014-06-02_16_31_22
-    def log_path(timestamp, name, basedir)
-      log_dir = File.join(basedir, timestamp.strftime("%F_%H_%M_%S"))
-      unless File.directory?(log_dir) then
-        FileUtils.mkdir_p(log_dir)
-
-        latest = File.join(basedir, "latest")
-        if !File.exist?(latest) or File.symlink?(latest) then
-          File.delete(latest) if File.exist?(latest)
-          File.symlink(File.basename(log_dir), latest)
-        end
+    #   ./log/2014-06-02_16_31_22/output.txt
+    #   ./log/latest -> 2014-06-02_16_31_22
+    def log_path(name, log_dir)
+      log_parent_dir = File.dirname(log_dir)
+      FileUtils.mkdir_p(log_dir) unless File.directory?(log_dir)
+
+      latest = File.join(log_parent_dir, "latest")
+      if !File.exist?(latest) or File.symlink?(latest) then
+        File.delete(latest) if File.exist?(latest)
+        File.symlink(File.basename(log_dir), latest)
       end
 
-      File.join(basedir, 'latest', name)
+      File.join(log_parent_dir, 'latest', name)
     end
 
   end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.21.0'
+    STRING = '2.0.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -65,6 +65,42 @@ module Beaker
       @answers = answers.answers
     end
 
+    it 'should add console services answers to dashboard answers' do
+      @ver = '3.4'
+      answers = @answers
+      expect( @answers['vm2'] ).to include :q_classifier_database_user => 'DFGhjlkj'
+      expect( @answers['vm2'] ).to include :q_classifier_database_name => 'pe-classifier'
+      expect( @answers['vm2'] ).to include :q_classifier_database_password => "'~!@\#$%^*-/ aZ'"
+      expect( @answers['vm2'] ).to include :q_activity_database_user => 'adsfglkj'
+      expect( @answers['vm2'] ).to include :q_activity_database_name => 'pe-activity'
+      expect( @answers['vm2'] ).to include :q_activity_database_password => "'~!@\#$%^*-/ aZ'"
+      expect( @answers['vm2'] ).to include :q_rbac_database_user => 'RbhNBklm'
+      expect( @answers['vm2'] ).to include :q_rbac_database_name => 'pe-rbac'
+      expect( @answers['vm2'] ).to include :q_rbac_database_password => "'~!@\#$%^*-/ aZ'"
+    end
+
+    it 'should add console services answers to database answers' do
+      @ver = '3.4'
+      answers = @answers
+      expect( @answers['vm3'] ).to include :q_classifier_database_user => 'DFGhjlkj'
+      expect( @answers['vm3'] ).to include :q_classifier_database_name => 'pe-classifier'
+      expect( @answers['vm3'] ).to include :q_classifier_database_password => "'~!@\#$%^*-/ aZ'"
+      expect( @answers['vm3'] ).to include :q_activity_database_user => 'adsfglkj'
+      expect( @answers['vm3'] ).to include :q_activity_database_name => 'pe-activity'
+      expect( @answers['vm3'] ).to include :q_activity_database_password => "'~!@\#$%^*-/ aZ'"
+      expect( @answers['vm3'] ).to include :q_rbac_database_user => 'RbhNBklm'
+      expect( @answers['vm3'] ).to include :q_rbac_database_name => 'pe-rbac'
+      expect( @answers['vm3'] ).to include :q_rbac_database_password => "'~!@\#$%^*-/ aZ'"
+    end
+
+    it 'should add answers to the host objects' do
+      @ver = '3.4'
+      answers = @answers
+      hosts.each do |host|
+        expect( host[:answers] ).to be === answers[host.name]
+      end
+    end
+
     it 'should add answers to the host objects' do
       hosts.each do |host|
         expect( host[:answers] ).to be === @answers[host.name]

data/spec/beaker/cli_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 module Beaker
-  describe CLI, :use_fakefs => true do
+  describe CLI do
     let(:cli)      { Beaker::CLI.new }
 
     context 'execute!' do
       before :each do
-        stub_const("Beaker::Logger", double().as_null_object )
+       stub_const("Beaker::Logger", double().as_null_object )
         File.open("sample.cfg", "w+") do |file|
           file.write("HOSTS:\n")
           file.write("  myhost:\n")
@@ -15,34 +15,34 @@ module Beaker
           file.write("    platform: ubuntu-x-x\n")
           file.write("CONFIG:\n")
         end
-        cli.stub(:setup).and_return(true)
-        cli.stub(:validate).and_return(true)
-        cli.stub(:provision).and_return(true)
+        allow( cli ).to receive(:setup).and_return(true)
+        allow( cli ).to receive(:validate).and_return(true)
+        allow( cli ).to receive(:provision).and_return(true)
       end
 
       describe "test fail mode" do
         it 'continues testing after failed test if using slow fail_mode' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'slow'
           cli.instance_variable_set(:@options, options)
 
-          cli.should_receive(:run_suite).exactly( 3 ).times
+          expect( cli ).to receive(:run_suite).exactly( 3 ).times
           expect{ cli.execute! }.to raise_error
 
         end
 
         it 'stops testing after failed test if using fast fail_mode' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           cli.instance_variable_set(:@options, options)
 
-          cli.should_receive(:run_suite).twice
+          expect( cli ).to receive(:run_suite).exactly( 2 ).times
           expect{ cli.execute! }.to raise_error
 
         end
@@ -50,9 +50,9 @@ module Beaker
 
       describe "SUT preserve mode" do
         it 'cleans up SUTs post testing if tests fail and preserve_hosts = never' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'never'
@@ -60,16 +60,16 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).once
+          expect( netmanager ).to receive(:cleanup).once
 
           expect{ cli.execute! }.to raise_error
 
         end
 
         it 'cleans up SUTs post testing if no tests fail and preserve_hosts = never' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_return(true)
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'never'
@@ -77,7 +77,7 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).once
+          expect( netmanager ).to receive(:cleanup).once
 
           expect{ cli.execute! }.to_not raise_error
 
@@ -85,9 +85,9 @@ module Beaker
 
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_return(true)
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'always'
@@ -95,16 +95,16 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).never
+          expect( netmanager ).to receive(:cleanup).never
 
           expect{ cli.execute! }.to_not raise_error
 
         end
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = always' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'always'
@@ -112,15 +112,15 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).never
+          expect( netmanager ).to receive(:cleanup).never
 
           expect{ cli.execute! }.to raise_error
         end
 
         it 'cleans up SUTs post testing if no tests fail and preserve_hosts = onfail' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_return(true)
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onfail'
@@ -128,16 +128,16 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).once
+          expect( netmanager ).to receive(:cleanup).once
 
           expect{ cli.execute! }.to_not raise_error
 
         end
 
         it 'preserves SUTs post testing if tests fail and preserve_hosts = onfail' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onfail'
@@ -145,16 +145,16 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).never
+          expect( netmanager ).to receive(:cleanup).never
 
           expect{ cli.execute! }.to raise_error
 
         end
 
         it 'cleans up SUTs post testing if tests fail and preserve_hosts = onpass' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_throw("bad test")
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_throw("bad test")
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
@@ -162,16 +162,16 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).once
+          expect( netmanager ).to receive(:cleanup).once
 
           expect{ cli.execute! }.to raise_error
 
         end
 
         it 'preserves SUTs post testing if no tests fail and preserve_hosts = onpass' do
-          cli.stub(:run_suite).with(:pre_suite, :fast).and_return(true)
-          cli.stub(:run_suite).with(:tests).and_return(true)
-          cli.stub(:run_suite).with(:post_suite).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:pre_suite, :fast).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:tests).and_return(true)
+          allow( cli ).to receive(:run_suite).with(:post_suite).and_return(true)
           options = cli.instance_variable_get(:@options)
           options[:fail_mode] = 'fast'
           options[:preserve_hosts] = 'onpass'
@@ -179,7 +179,7 @@ module Beaker
 
           netmanager = double(:netmanager)
           cli.instance_variable_set(:@network_manager, netmanager)
-          netmanager.should_receive(:cleanup).never
+          expect( netmanager ).to receive(:cleanup).never
 
           expect{ cli.execute! }.to_not raise_error
         end