beaker 2.9.0 → 2.10.0

data/spec/beaker/dsl/install_utils/puppet_utils_spec.rb

@@ -28,6 +28,10 @@ describe ClassMixedWithDSLInstallUtils do
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp' } ) }
+  let(:winhost_non_cygwin) { make_host( 'winhost_non_cygwin', { :platform => 'windows',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp',
+                                                :is_cygwin => 'false' } ) }
   let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp' } ) }
@@ -87,6 +91,34 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  context 'install_puppet_from_msi' do
+
+    it 'installs puppet on cygwin windows' do
+      allow(subject).to receive(:link_exists?).and_return( true )
+
+      expect(subject).to receive(:on).with(winhost, 'curl -O http://downloads.puppetlabs.com/windows/puppet-3.7.1.msi')
+      expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
+      expect(subject).to receive(:on).with(winhost, 'cmd /C \'start /w msiexec.exe /qn /i puppet-3.7.1.msi\'')
+
+      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppetlabs.com/windows'}  )
+    end
+
+    it 'installs puppet on non-cygwin windows' do
+      allow(subject).to receive(:link_exists?).and_return( true )
+
+      expect(winhost_non_cygwin).to receive(:mkdir_p).with('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
+
+      expect(subject).to receive(:on) do |winhost_non_cygwin, beaker_command|
+        expect(beaker_command.command).to eq('powershell.exe')
+        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('http://downloads.puppetlabs.com/windows/puppet-3.7.1.msi','C:\\Windows\\Temp\\puppet-3.7.1.msi')"])
+      end
+
+      expect(subject).to receive(:on).with(winhost_non_cygwin, "start /w msiexec.exe /qn /i C:\\Windows\\Temp\\puppet-3.7.1.msi")
+
+      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppetlabs.com/windows'}   )
+    end
+  end
+
   context 'install_from_git' do
     it 'does a ton of stuff it probably shouldnt' do
       repo = { :name => 'puppet',
@@ -343,26 +375,33 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
-  RSpec.shared_examples "install-dev-repo" do
-
-    it "scp's files to SUT then modifies them with find-and-sed 2-hit combo" do
-      allow(rez).to receive(:exit_code) { 0 }
-      allow(subject).to receive(:link_exists?).and_return(true)
-      expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
-      expect(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
-      expect(subject).to receive(:scp_to).with( host, repo_dir, /.*/ ).ordered
-      expect(subject).to receive(:on).with( host, /^find .* sed .*/ ).ordered
-      subject.install_puppetlabs_dev_repo host, package_name, package_version
-    end
-
-  end
-
   describe "#install_puppetlabs_dev_repo" do
     let( :package_name ) { "puppet" }
     let( :package_version ) { "7.5.6" }
     let( :host ) do
       FakeHost.create('fakvm', platform.to_s, opts)
     end
+    let( :logger_double ) do
+      logger_double = Object.new
+      allow(logger_double).to receive(:debug)
+      subject.instance_variable_set(:@logger, logger_double)
+      logger_double
+    end
+
+    RSpec.shared_examples "install-dev-repo" do
+
+      it "scp's files to SUT then modifies them with find-and-sed 2-hit combo" do
+        allow(rez).to receive(:exit_code) { 0 }
+        allow(logger_double).to receive(:debug)
+        allow(subject).to receive(:link_exists?).and_return(true)
+        expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
+        expect(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
+        expect(subject).to receive(:scp_to).with( host, repo_dir, /.*/ ).ordered
+        expect(subject).to receive(:on).with( host, /^find .* sed .*/ ).ordered
+        subject.install_puppetlabs_dev_repo host, package_name, package_version
+      end
+
+    end
 
     describe "When host is unsupported platform" do
       let( :platform ) { Beaker::Platform.new('solaris-7-i386') }
@@ -406,15 +445,18 @@ describe ClassMixedWithDSLInstallUtils do
 
         it 'sets up the PC1 repository if that was downloaded' do
           allow(rez).to receive(:exit_code) { 0 }
+          allow(logger_double).to receive(:debug)
 
           stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
 
+          opts[:dev_builds_repos] = ['PC1']
           expect(subject).to receive(:on).with( host, /^find .* sed .*PC1.*/ )
           subject.install_puppetlabs_dev_repo host, package_name, package_version
         end
 
         it 'sets up the main repository if that was downloaded' do
-          allow(rez).to receive(:exit_code) { 1 }
+          allow(rez).to receive(:exit_code) { 0 }
+          allow(logger_double).to receive(:debug)
 
           stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
 
@@ -428,13 +470,29 @@ describe ClassMixedWithDSLInstallUtils do
         let( :platform ) { Beaker::Platform.new('el-7-i386') }
         include_examples "install-dev-repo"
 
-        it 'downloads PC1, products, or devel repo -- in that order' do
+        it 'downloads products or devel repo -- in that order, by default' do
           allow(subject).to receive(:on).with( host, /^find .* sed .*/ )
           stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
 
-          expect(subject).to receive(:link_exists?).with(/.*PC1.*/).and_return( false )
+          expect(logger_double).to receive(:debug).exactly( 2 ).times
           expect(subject).to receive(:link_exists?).with(/.*products.*/).and_return( false )
-          expect(subject).to receive(:link_exists?).with(/.*devel.*/).and_return( true )
+          expect(subject).to receive(:link_exists?).with(/.*devel.*/).twice.and_return( true )
+
+          subject.install_puppetlabs_dev_repo host, package_name, package_version
+        end
+
+        it 'allows ordered customization of repos based on the :dev_builds_repos option' do
+          opts[:dev_builds_repos] = ['PC17', 'yomama', 'McGuyver', 'McGruber', 'panama']
+          allow(subject).to receive(:on).with( host, /^find .* sed .*/ )
+          stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
+
+          logger_call_num = opts[:dev_builds_repos].length + 2
+          expect(logger_double).to receive(:debug).exactly( logger_call_num ).times
+          opts[:dev_builds_repos].each do |repo|
+            expect(subject).to receive(:link_exists?).with(/.*repo.*/).ordered.and_return( false )
+          end
+          expect(subject).to receive(:link_exists?).with(/.*products.*/).ordered.and_return( false )
+          expect(subject).to receive(:link_exists?).with(/.*devel.*/).twice.ordered.and_return( true )
 
           subject.install_puppetlabs_dev_repo host, package_name, package_version
         end
@@ -567,7 +625,7 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe '#install_cert_on_windows' do
     before do
-      subject.stub(:on).and_return(Beaker::Result.new({},''))
+      allow(subject).to receive(:on).and_return(Beaker::Result.new({},''))
     end
 
     context 'on windows' do
@@ -598,7 +656,7 @@ describe ClassMixedWithDSLInstallUtils do
         5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
         -----END CERTIFICATE-----
         EOM
-        
+
         expect(subject).to receive(:create_remote_file) do |host, file_path, file_content|
           expect(file_path).to eq("C:\\Windows\\Temp\\#{cert}.pem")
         end

data/spec/beaker/network_manager_spec.rb

@@ -34,7 +34,7 @@ module Beaker
         expect( pieces[1] ).to be === '[+]'
         expect( pieces[2] ).to be === hypervisor_value
         expect( pieces[3] ).to be === platform_value
-        expect( pieces[4] ).to be === host.name
+        expect( pieces[4] ).to be === host.log_prefix
       end
 
       it 'follows the create parameter correctly' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -421,6 +421,7 @@ files:
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
 - lib/beaker/host/freebsd.rb
+- lib/beaker/host/freebsd/exec.rb
 - lib/beaker/host/mac.rb
 - lib/beaker/host/mac/group.rb
 - lib/beaker/host/mac/user.rb