beaker 1.7.0 → 1.8.0

data/lib/beaker/utils/validator.rb

@@ -3,6 +3,7 @@ module Beaker
     module Validator
       PACKAGES = ['curl']
       UNIX_PACKAGES = ['ntpdate']
+      SLES_PACKAGES = ['ntp']
 
       def self.validate(hosts, logger)
         hosts.each do |host|
@@ -11,12 +12,20 @@ module Beaker
               host.install_package pkg
             end
           end
-          if host['platform'] !~ /(windows)|(aix)|(solaris)/
-            UNIX_PACKAGES.each do |pkg|
-              if not host.check_for_package pkg
-                host.install_package pkg
+          case
+            when host['platform'] =~ /sles-/
+              SLES_PACKAGES.each do |pkg|
+                if not host.check_for_package pkg
+                  host.install_package pkg
+                end
+              end
+
+            when host['platform'] !~ /(windows)|(aix)|(solaris)/
+              UNIX_PACKAGES.each do |pkg|
+                if not host.check_for_package pkg
+                  host.install_package pkg
+                end
               end
-            end
           end
         end
       rescue => e

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.7.0'
+    STRING = '1.8.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -8,6 +8,12 @@ module Beaker
                           basic_hosts }
     let( :master_certname ) { 'master_certname' }
 
+    it 'generates 3.2 answers for 3.3 hosts' do
+      @ver = '3.3'
+      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
+      subject.answers( @ver, hosts, master_certname, {} )
+    end
+
     it 'generates 3.2 answers for 3.2 hosts' do
       @ver = '3.2'
       Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
@@ -63,7 +69,15 @@ module Beaker
       it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
         @ver = '3.2'
         expect( subject.answers( hosts, master_certname, {:type => :upgrade} )['vm2']).to include :q_upgrade_with_unknown_disk_space
-    end
+      end
+
+      it 'should add answers to the host objects' do
+        @ver = '3.2'
+        answers = subject.answers( hosts, master_certname, {})
+        hosts.each do |host|
+          expect( host[:answers] ).to be === answers[host.name]
+        end
+      end
     end
 
     describe Version30 do
@@ -85,9 +99,18 @@ module Beaker
       it 'sets correct answers for a master' do
         expect( subject.answers( hosts, master_certname, {} )['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0], :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>"master_certname", :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0], :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
       end
+
       it 'generates nil answers for a windows host' do
         expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
       end
+
+      it 'should add answers to the host objects' do
+        @ver = '3.0'
+        answers = subject.answers( hosts, master_certname, {})
+        hosts.each do |host|
+          expect( host[:answers] ).to be === answers[host.name]
+        end
+      end
     end
 
     describe Version28 do
@@ -109,6 +132,13 @@ module Beaker
         expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
       end
 
+      it 'should add answers to the host objects' do
+        @ver = '2.8'
+        answers = subject.answers( hosts, master_certname, {})
+        hosts.each do |host|
+          expect( host[:answers] ).to be === answers[host.name]
+        end
+      end
 
     end
     describe Version20 do
@@ -130,6 +160,14 @@ module Beaker
         expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
       end
 
+      it 'should add answers to the host objects' do
+        @ver = '2.0'
+        answers = subject.answers( hosts, master_certname, {})
+        hosts.each do |host|
+          expect( host[:answers] ).to be === answers[host.name]
+        end
+      end
+
     end
 
   end

data/spec/beaker/dsl/helpers_spec.rb

@@ -95,10 +95,10 @@ describe ClassMixedWithDSLHelpers do
         host.should_receive( :exec ).and_return( result )
       end
 
-      it 'yields self' do
+      it 'yields result' do
         subject.on host, command do |containing_class|
           expect( containing_class ).
-            to be_an_instance_of( ClassMixedWithDSLHelpers )
+            to be_an_instance_of( Beaker::Result )
         end
       end
 
@@ -651,11 +651,17 @@ describe ClassMixedWithDSLHelpers do
   end
 
   describe '#with_puppet_running_on' do
-    let(:is_pe) { false }
-    let(:host) { FakeHost.new(:pe => is_pe) }
     let(:test_case_path) { 'testcase/path' }
     let(:tmpdir_path) { '/tmp/tmpdir' }
     let(:puppet_path) { '/puppet/path' }
+    let(:is_pe) { false }
+    let(:host) do
+      FakeHost.new(:pe => is_pe,
+                   :options => {
+        'puppetpath' => puppet_path,
+        'platform' => 'el'
+      })
+    end
 
     def stub_host_and_subject_to_allow_the_default_testdir_argument_to_be_created
       subject.instance_variable_set(:@path, test_case_path)
@@ -665,7 +671,6 @@ describe ClassMixedWithDSLHelpers do
 
     before do
       stub_host_and_subject_to_allow_the_default_testdir_argument_to_be_created
-      host.stub(:[]).and_return(puppet_path)
     end
 
     it "raises an ArgumentError if you try to submit a String instead of a Hash of options" do
@@ -790,6 +795,26 @@ describe ClassMixedWithDSLHelpers do
           end.to raise_error(RuntimeError, /failed.*because.*Failed while yielding./)
         end
 
+        it 'dumps the puppet logs if there is an error in the teardown' do
+          host.should_receive(:port_open?).with(8140).and_return(true)
+
+          subject.logger.should_receive(:notify).with(/Dumping master log/)
+
+          expect do
+            subject.with_puppet_running_on(host, {})
+          end.to raise_error(RuntimeError, /Also failed in teardown/)
+        end
+
+        it 'does not mask the teardown error with an error from dumping the logs' do
+          host.should_receive(:port_open?).with(8140).and_return(true)
+
+          subject.logger.should_receive(:notify).with(/Dumping master log/).and_raise("Error from dumping logs")
+
+          expect do
+            subject.with_puppet_running_on(host, {})
+          end.to raise_error(RuntimeError, /Also failed in teardown/)
+        end
+
         it 'does not swallow a teardown exception if no earlier exception was raised' do
           host.should_receive(:port_open?).with(8140).and_return(true)
           subject.logger.should_not_receive(:error)

data/spec/beaker/options/parser_spec.rb

@@ -9,7 +9,6 @@ module Beaker
       let(:hosts_path)       { File.join(File.expand_path(File.dirname(__FILE__)), "data", "hosts.cfg") }
       let(:badyaml_path)     { File.join(File.expand_path(File.dirname(__FILE__)), "data", "badyaml.cfg") }
       let(:home)             { ENV['HOME'] }
-      let(:platforms_regex)  { Parser::PLATFORMS }
 
       it "supports usage function" do
         expect{parser.usage}.to_not raise_error
@@ -21,26 +20,6 @@ module Beaker
         expect(parser.repo).to be === "#{repo}"
       end
 
-      #read through the file of possible platform values, correctly identify the 50 invalid platform values
-      describe "recognizes valid platforms" do
-
-        it "accepts correctly formatted platform values" do
-          expect( 'oracle-version-arch' =~ platforms_regex ).to be === 0
-        end
-
-        it "rejects non-supported osfamilies" do
-          expect( 'amazon6-version-arch' =~ platforms_regex ).to be === nil
-        end
-
-        it "rejects platforms without version/arch" do
-          expect( 'ubuntu-5' =~ platforms_regex ).to be === nil
-        end
-
-        it "rejects platforms that do not have osfamily at start of string" do
-          expect( 'oel-r5-u6-x86-64' =~ platforms_regex ).to be === nil
-        end
-      end
-
       #test parse_install_options
       it "can transform --install PUPPET/3.1 into #{repo}/puppet.git#3.1" do
         opts = ["PUPPET/3.1"]
@@ -154,7 +133,7 @@ module Beaker
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
         args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
       end
 
       it "ensures that fail-mode is one of fast/slow" do
@@ -174,10 +153,10 @@ module Beaker
           {
             'HOSTS' => {
               :master => {
-                :roles => ["master","agent"],
+                :roles => ["master","agent","arbitrary_role"],
               },
               :agent => {
-                :roles => ["agent"],
+                :roles => ["agent","default","other_abitrary_role"],
               },
             }
           }
@@ -198,7 +177,7 @@ module Beaker
           it "restricts #{platform} hosts to agent for #{type}" do
             hosts_file = fake_hosts_file_for_platform(hosts, platform)
             args << "--hosts" << hosts_file
-            expect { parser.parse_args(args) }.to raise_error(ArgumentError, /#{platform}.*can only have role 'agent'/)
+            expect { parser.parse_args(args) }.to raise_error(ArgumentError, /#{platform}.*may not have roles 'master', 'dashboard', or 'database'/)
           end
         end
 

data/spec/beaker/platform_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+module Beaker
+  describe Platform do
+
+    let( :logger )    { double( 'logger' ) }
+    let( :platform )  { Platform.new(@name) }
+
+    context 'initialize' do
+
+      describe "recognizes valid platforms" do
+
+        it "accepts correctly formatted platform values" do
+          @name = 'oracle-version-arch'
+          expect{ platform }.not_to raise_error
+        end
+
+        it "rejects non-supported osfamilies" do
+          @name = 'amazon6-version-arch'
+          expect{ platform }.to raise_error(ArgumentError)
+        end
+
+        it "rejects platforms without version/arch" do
+          @name = 'ubuntu-5'
+          expect{ platform }.to raise_error(ArgumentError)
+        end
+
+        it "rejects platforms that do not have osfamily at start of string" do
+          @name = 'o3l-r5-u6-x86'
+          expect{ platform }.to raise_error(ArgumentError)
+        end
+
+      end 
+
+    end
+
+    context 'with_version_codename' do
+
+      it "can convert debian-7-xxx to debian-wheezy-xxx" do
+        @name = 'debian-7-xxx'
+        expect( platform.with_version_codename ).to be === 'debian-wheezy-xxx'
+      end
+
+      it "can convert debian-6-xxx to debian-squeeze-xxx" do
+        @name = 'debian-6-xxx'
+        expect( platform.with_version_codename ).to be === 'debian-squeeze-xxx'
+      end
+
+      it "can convert ubuntu-1310-xxx to ubuntu-saucy-xxx" do
+        @name = 'ubuntu-1310-xxx'
+        expect( platform.with_version_codename ).to be === 'ubuntu-saucy-xxx'
+      end
+
+      it "can convert ubuntu-12.10-xxx to ubuntu-quantal-xxx" do
+        @name = 'ubuntu-12.10-xxx'
+        expect( platform.with_version_codename ).to be === 'ubuntu-quantal-xxx'
+      end
+
+      it "leaves centos-7-xxx alone" do
+        @name = 'centos-7-xxx'
+        expect( platform.with_version_codename ).to be === 'centos-7-xxx'
+      end
+
+    end
+
+    context 'with_version_number' do
+
+      it "can convert debian-wheezy-xxx to debian-7-xxx" do
+        @name = 'debian-wheezy-xxx'
+        expect( platform.with_version_number ).to be === 'debian-7-xxx'
+      end
+
+      it "can convert debian-squeeze-xxx to debian-6-xxx" do
+        @name = 'debian-squeeze-xxx'
+        expect( platform.with_version_number ).to be === 'debian-6-xxx'
+      end
+
+      it "can convert ubuntu-saucy-xxx to ubuntu-1310-xxx" do
+        @name = 'ubuntu-saucy-xxx'
+        expect( platform.with_version_number ).to be === 'ubuntu-1310-xxx'
+      end
+
+      it "can convert ubuntu-quantal-xxx to ubuntu-1210-xxx" do
+        @name = 'ubuntu-quantal-xxx'
+        expect( platform.with_version_number ).to be === 'ubuntu-1210-xxx'
+      end
+
+      it "leaves centos-7-xxx alone" do
+        @name = 'centos-7-xxx'
+        expect( platform.with_version_number ).to be === 'centos-7-xxx'
+      end
+
+    end
+
+  end
+
+end

data/spec/beaker/utils/ntp_control_spec.rb

@@ -15,6 +15,24 @@ module Beaker
 
       end
 
+      it "can retry on failure on unix hosts" do
+        @hosts = make_hosts( { :platform => 'unix', :exit_code => [1, 0] } )
+        ntp_control.stub( :sleep ).and_return(true)
+
+        Command.should_receive( :new ).with("ntpdate -t 20 #{ntpserver}").exactly( 6 ).times
+
+        ntp_control.timesync
+      end
+
+      it "eventually gives up and raises an error when unix hosts can't be synched" do
+        @hosts = make_hosts( { :platform => 'unix', :exit_code => 1 } )
+        ntp_control.stub( :sleep ).and_return(true)
+
+        Command.should_receive( :new ).with("ntpdate -t 20 #{ntpserver}").exactly( 5 ).times
+
+        expect{ ntp_control.timesync }.to raise_error
+      end
+
       it "can sync time on solaris-10 hosts" do
         @hosts = make_hosts( { :platform => 'solaris-10' } )
 
@@ -36,6 +54,16 @@ module Beaker
 
       end
 
+      it "can sync time on Sles hosts" do
+        @hosts = make_hosts( { :platform => 'sles-13.1-x64' } )
+
+        Command.should_receive( :new ).with("sntp #{ntpserver}").exactly( 3 ).times
+
+        ntp_control.timesync
+
+      end
+    
+
     end
 
   end

data/spec/beaker/utils/validator_spec.rb

@@ -6,6 +6,7 @@ module Beaker
       let( :validator )      { Beaker::Utils::Validator }
       let( :pkgs )           { Beaker::Utils::Validator::PACKAGES }
       let( :unix_only_pkgs ) { Beaker::Utils::Validator::UNIX_PACKAGES }
+      let( :sles_only_pkgs ) { Beaker::Utils::Validator::SLES_PACKAGES }
       let( :platform )       { @platform || 'unix' }
       let( :hosts )          { hosts = make_hosts( { :platform => platform } )
                                hosts[0][:roles] = ['agent']
@@ -26,6 +27,10 @@ module Beaker
               host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
               host.should_receive( :install_package ).with( pkg ).once
             end
+            sles_only_pkgs.each do |pkg|
+              host.should_receive( :check_for_package).with( pkg ).never
+              host.should_receive( :install_package ).with( pkg ).never
+            end
             
           end
 
@@ -45,6 +50,34 @@ module Beaker
               host.should_receive( :check_for_package).with( pkg ).never
               host.should_receive( :install_package ).with( pkg ).never
             end
+            sles_only_pkgs.each do |pkg|
+              host.should_receive( :check_for_package).with( pkg ).never
+              host.should_receive( :install_package ).with( pkg ).never
+            end
+
+          end
+
+          validator.validate(hosts, logger)
+
+        end
+
+        it "can validate SLES hosts" do
+          @platform = 'sles-13.1-x64'
+
+          hosts.each do |host|
+            pkgs.each do |pkg|
+              host.should_receive( :check_for_package ).with( pkg ).once.and_return( false )
+              host.should_receive( :install_package ).with( pkg ).once
+            end
+            unix_only_pkgs.each do |pkg|
+              host.should_receive( :check_for_package).with( pkg ).never
+              host.should_receive( :install_package ).with( pkg ).never
+            end
+            sles_only_pkgs.each do |pkg|
+              host.should_receive( :check_for_package).with( pkg ).once.and_return( false )
+              host.should_receive( :install_package ).with( pkg ).once
+            end
+
           end
 
           validator.validate(hosts, logger)

data/spec/helpers.rb

@@ -58,12 +58,13 @@ module HostHelpers
 
   def generate_result (name, opts )
     result = double( 'result' )
-    stdout = opts.has_key?(:stdout) ? opts[:stdout] :  name
+    stdout = opts.has_key?(:stdout) ? opts[:stdout] : name
     stderr = opts.has_key?(:stderr) ? opts[:stderr] : name
     exit_code = opts.has_key?(:exit_code) ? opts[:exit_code] :  0
+    exit_code = [exit_code].flatten
     result.stub( :stdout ).and_return( stdout )
     result.stub( :stderr ).and_return( stderr )
-    result.stub( :exit_code ).and_return( exit_code )
+    result.stub( :exit_code ).and_return( *exit_code )
     result
   end