beaker 1.12.2 → 1.13.0

data/spec/beaker/host_spec.rb

@@ -11,8 +11,8 @@ module Beaker
       expect( host ).to be_a_kind_of Windows::Host
     end
 
-    it 'defaults to a unix host' do 
-      expect( host ).to be_a_kind_of Unix::Host 
+    it 'defaults to a unix host' do
+      expect( host ).to be_a_kind_of Unix::Host
     end
 
     it 'can be read like a hash' do
@@ -189,5 +189,6 @@ module Beaker
       end
 
     end
+
   end
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -128,7 +128,7 @@ module Beaker
       end
 
       it 'should start the container' do
-        container.should_receive(:start).with({'PublishAllPorts' => true})
+        container.should_receive(:start).with({'PublishAllPorts' => true, 'Privileged' => true})
 
         docker.provision
       end

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,14 +6,14 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--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", "--no-xml", "--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"]}
+      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--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"]}
 
       it "can correctly read command line input" do
         expect(parser.parse(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :tests=>"test.rb", :help=>true}
       end
 
       it "supports all our command line options" do
-        expect(parser.parse(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :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, :xml=>false, :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"}
+        expect(parser.parse(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :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"}
       end
 
       it "can produce a usage description" do

data/spec/beaker/puppet_command_spec.rb

@@ -26,8 +26,8 @@ module Beaker
       expect( cmd.args_string    ).to be == 'to the baz'
       expect( cmd.options_string ).to be == '--foo=bar'
 
-      win_path  = %q[PATH="/opt/puppet-git-repos/hiera/bin:${PATH}"]
-      win_lib   = %q[RUBYLIB="`cygpath -w /opt/puppet-git-repos/hiera/lib`;`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`;${RUBYLIB}"]
+      win_path  = %q[/opt/puppet-git-repos/hiera/bin:${PATH}]
+      win_lib   = %q[`cygpath -w /opt/puppet-git-repos/hiera/lib`;`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`;${RUBYLIB}]
       cmd_exe   = %q[cmd.exe /c]
 
       command_line = cmd.environment_string_for( host, cmd.environment )

data/spec/beaker/ssh_connection_spec.rb

@@ -3,25 +3,26 @@ require 'net/ssh'
 
 module Beaker
   describe SshConnection do
-    let( :host )    { 'my_host' }
-    let( :user )    { 'root'    }
-    let( :options ) { Hash.new  }
-    subject(:connection) { SshConnection.new host, user, options }
+    let( :host )     { 'my_host' }
+    let( :user )     { 'root'    }
+    let( :ssh_opts ) { {} }
+    let( :options )  { { :logger => double('logger').as_null_object }  }
+    subject(:connection) { SshConnection.new host, user, ssh_opts, options }
 
     it 'self.connect creates connects and returns a proxy for that connection' do
       # grrr
-      Net::SSH.should_receive(:start).with( host, user, options )
-      connection_constructor = SshConnection.connect host, user, options
+      Net::SSH.should_receive(:start).with( host, user, ssh_opts )
+      connection_constructor = SshConnection.connect host, user, ssh_opts, options
       expect( connection_constructor ).to be_a_kind_of SshConnection
     end
 
     it 'connect creates a new connection' do
-      Net::SSH.should_receive( :start ).with( host, user, options )
+      Net::SSH.should_receive( :start ).with( host, user, ssh_opts)
       connection.connect
     end
 
     it 'connect caches its connection' do
-      Net::SSH.should_receive( :start ).with( host, user, options ).once.and_return true
+      Net::SSH.should_receive( :start ).with( host, user, ssh_opts ).once.and_return true
       connection.connect
       connection.connect
     end

data/spec/beaker/test_suite_spec.rb

@@ -27,5 +27,113 @@ module Beaker
       end
 
     end
+
+    describe TestSuite::TestSuiteResult do
+
+      let( :options )           { make_opts.merge({ :logger => double().as_null_object }) }
+      let( :hosts )             { make_hosts() }
+      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 ) { TestSuite::TestSuiteResult.new( options, "my_suite") }
+
+      it 'supports adding test cases' do
+        expect( test_suite_result.test_count ).to be === 0
+        test_suite_result.add_test_case( testcase1 )
+        expect( test_suite_result.test_count ).to be === 1
+      end
+
+      it 'calculates passed tests' do
+        testcase1.instance_variable_set(:@test_status, :pass)
+        testcase2.instance_variable_set(:@test_status, :pass)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.passed_tests ).to be == 2
+      end
+
+      it 'calculates failed tests' do
+        testcase1.instance_variable_set(:@test_status, :pass)
+        testcase2.instance_variable_set(:@test_status, :pass)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.failed_tests ).to be == 1
+      end
+
+      it 'calculates errored tests' do
+        testcase1.instance_variable_set(:@test_status, :error)
+        testcase2.instance_variable_set(:@test_status, :pass)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.errored_tests ).to be == 1
+      end
+
+      it 'calculates skipped tests' do
+        testcase1.instance_variable_set(:@test_status, :error)
+        testcase2.instance_variable_set(:@test_status, :skip)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.skipped_tests ).to be == 1
+      end
+
+      it 'calculates pending tests' do
+        testcase1.instance_variable_set(:@test_status, :error)
+        testcase2.instance_variable_set(:@test_status, :pending)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.pending_tests ).to be == 1
+      end
+
+      it 'calculates sum_failed as a sum of errored and failed TestCases' do
+        testcase1.instance_variable_set(:@test_status, :error)
+        testcase2.instance_variable_set(:@test_status, :pending)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.sum_failed ).to be == 2
+      end
+
+      it 'reports success with no errors/failures' do
+        testcase1.instance_variable_set(:@test_status, :pass)
+        testcase2.instance_variable_set(:@test_status, :pending)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.success? ).to be == false
+      end
+
+      it 'reports failed if any tests error/fail' do
+        testcase1.instance_variable_set(:@test_status, :pass)
+        testcase2.instance_variable_set(:@test_status, :pending)
+        testcase3.instance_variable_set(:@test_status, :fail)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.failed? ).to be == true
+      end
+
+      it 'can calculate the sum of all TestCase runtimes' do
+        testcase1.instance_variable_set(:@runtime, 1)
+        testcase2.instance_variable_set(:@runtime, 10)
+        testcase3.instance_variable_set(:@runtime, 100)
+        test_suite_result.add_test_case( testcase1 )
+        test_suite_result.add_test_case( testcase2 )
+        test_suite_result.add_test_case( testcase3 )
+        expect( test_suite_result.elapsed_time ).to be == 111
+      end
+
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beaker
 version: !ruby/object:Gem::Version 
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors: 
 - Puppetlabs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-12 00:00:00 Z
+date: 2014-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -165,9 +165,9 @@ dependencies:
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "1.38"
+        version: 1.42.0
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -272,6 +272,7 @@ files:
 - lib/beaker/hypervisor/vcloud_pooled.rb
 - lib/beaker/hypervisor/vsphere.rb
 - lib/beaker/hypervisor/vsphere_helper.rb
+- lib/beaker/junit.xsl
 - lib/beaker/logger.rb
 - lib/beaker/network_manager.rb
 - lib/beaker/options.rb
@@ -290,6 +291,8 @@ files:
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
+- lib/beaker/tasks/rake_task.rb
+- lib/beaker/tasks/test.rb
 - lib/beaker/test_case.rb
 - lib/beaker/test_suite.rb
 - lib/beaker/version.rb
@@ -303,6 +306,7 @@ files:
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
+- spec/beaker/host/unix/pkg_spec.rb
 - spec/beaker/host/windows/group_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
@@ -381,6 +385,7 @@ test_files:
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
+- spec/beaker/host/unix/pkg_spec.rb
 - spec/beaker/host/windows/group_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb