beaker 2.52.0 → 3.0.0

data/spec/beaker/host/unix/pkg_spec.rb

@@ -341,6 +341,7 @@ module Beaker
                 if version == 10
                   allow( instance ).to receive( :noask_file_text )
                   allow( instance ).to receive( :create_remote_file )
+                  allow( instance ).to receive( :execute ).with('/opt/csw/bin/pkgutil -y -i pkgutil')
                 end
                 # only expect diff in the last line: .not_to vs .to raise_error
                 expect{

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -163,37 +163,6 @@ describe Beaker do
     end
   end
 
-  context "epel_info_for!" do
-    subject { dummy_class.new }
-
-    it "can return the correct url for an el-7 host" do
-      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-7-platform') } )
-
-      expect( subject.epel_info_for( host, options )).to be === ["http://dl.fedoraproject.org/pub/epel/7", "x86_64", "epel-release-7-8.noarch.rpm"]
-    end
-
-    it "can return the correct url for an el-6 host" do
-      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-6-platform') } )
-
-      expect( subject.epel_info_for( host, options )).to be === ["http://dl.fedoraproject.org/pub/epel/6", "i386", "epel-release-6-8.noarch.rpm"]
-    end
-
-    it "can return the correct url for an el-5 host" do
-      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-5-platform') } )
-
-      expect( subject.epel_info_for( host, options )).to be === ["http://dl.fedoraproject.org/pub/epel/5", "i386", "epel-release-5-4.noarch.rpm"]
-
-    end
-
-    it "raises an error on non el-5/6 host" do
-      host = make_host( 'testhost', { :platform => Beaker::Platform.new('el-4-platform') } )
-
-      expect{ subject.epel_info_for( host, options )}.to raise_error(ArgumentError, /epel_info_for does not support el version/)
-
-    end
-
-  end
-
   context "apt_get_update" do
     subject { dummy_class.new }
 
@@ -335,8 +304,8 @@ describe Beaker do
       hosts[4][:platform] = Beaker::Platform.new('oracle-5-arch')
 
       expect( Beaker::Command ).to receive( :new ).with("rpm -qa | grep epel-release").exactly( 6 ).times
-      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm").exactly( 4 ).times
-      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm").exactly( 2 ).times
+      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm").exactly( 4 ).times
+      expect( Beaker::Command ).to receive( :new ).with("rpm -i http://dl.fedoraproject.org/pub/epel/epel-release-latest-5.noarch.rpm").exactly( 2 ).times
       expect( Beaker::Command ).to receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/6/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 4 ).times
       expect( Beaker::Command ).to receive( :new ).with("sed -i -e 's;#baseurl.*$;baseurl=http://dl\\.fedoraproject\\.org/pub/epel/5/$basearch;' /etc/yum.repos.d/epel.repo").exactly( 2 ).times
       expect( Beaker::Command ).to receive( :new ).with("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo").exactly( 6 ).times

data/spec/beaker/host_spec.rb

@@ -197,7 +197,7 @@ module Beaker
         result.exit_code = 1
         expect( Beaker::Command ).to receive(:new).with("grep ^key=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::Command ).to receive(:new).with(/grep \^key ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^key= ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
         expect( Beaker::Command ).to receive(:new).with("echo \"key=/my/first/value\" >> ~/.ssh/environment")
         host.add_env_var('key', '/my/first/value')
@@ -210,7 +210,7 @@ module Beaker
         expect( host ).to receive(:exec).and_return(result)
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with(/grep \^key ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^key= ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
         expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/^key=/key=\\/my\\/first\\/value:/', '~/.ssh/environment')
         host.add_env_var('key', '/my/first/value')
@@ -740,5 +740,17 @@ module Beaker
         expect(host.ip).to eq('127.0.0.1')
       end
     end
+
+    describe "#wait_for_port" do
+      it 'returns true when port is open' do
+        allow(host).to receive(:repeat_fibonacci_style_for).and_return(true)
+        expect(host.wait_for_port(22, 0)).to be true
+      end
+
+      it 'returns false when port is not open' do
+        allow(host).to receive(:repeat_fibonacci_style_for).and_return(false)
+        expect(host.wait_for_port(22, 0)).to be false
+      end
+    end
   end
 end

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -4,21 +4,6 @@ module Beaker
   describe Hypervisor do
     let( :hypervisor ) { Beaker::Hypervisor }
 
-    it "creates an aix hypervisor for aix hosts" do
-      aix = double( 'aix' )
-      allow( aix ).to receive( :provision ).and_return( true )
-
-      expect( Aixer ).to receive( :new ).once.and_return( aix )
-      expect( hypervisor.create( 'aix', [], make_opts() ) ).to be === aix
-    end
-
-    it "creates a solaris hypervisor for solaris hosts" do
-      solaris = double( 'solaris' )
-      allow( solaris ).to receive( :provision ).and_return( true )
-      expect( Solaris ).to receive( :new ).once.and_return( solaris )
-      expect( hypervisor.create( 'solaris', [], make_opts() ) ).to be === solaris
-    end
-
     it "creates a vsphere hypervisor for vsphere hosts" do
       vsphere = double( 'vsphere' )
       allow( vsphere ).to receive( :provision ).and_return( true )

data/spec/beaker/hypervisor/openstack_spec.rb

@@ -29,6 +29,7 @@ module Beaker
       expect(options['openstack_network']).to eq('testing')
       expect(options['openstack_keyname']).to eq('nopass')
       expect(options['security_group']).to eq(['my_sg', 'default'])
+      expect(options['floating_ip_pool']).to eq('my_pool')
     end
 
     it 'check hosts options during initialization' do
@@ -61,6 +62,10 @@ module Beaker
         :image_ref => 54321)
       )
 
+      @hosts.each do |host|
+        allow(host).to receive(:wait_for_port).and_return(true)
+      end
+
       openstack.provision
     end
 

data/spec/helpers.rb

@@ -70,6 +70,7 @@ module HostHelpers
                                                :openstack_tenant => "testing",
                                                :openstack_network => "testing",
                                                :openstack_keyname => "nopass", 
+                                               :floating_ip_pool => "my_pool",
                                                :security_group => ['my_sg', 'default'] } )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.52.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +234,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: beaker-answers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +262,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: beaker-pe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: beaker-hostgenerator
   requirement: !ruby/object:Gem::Requirement
@@ -310,20 +282,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: fission
   requirement: !ruby/object:Gem::Requirement
@@ -344,20 +310,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
@@ -386,54 +346,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.99'
-- !ruby/object:Gem::Dependency
-  name: fog-google
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.25'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.25'
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -448,20 +374,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: public_suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 description: Puppetlabs accceptance testing harness
 email:
 - delivery@puppetlabs.com
@@ -477,7 +389,6 @@ files:
 - CONTRIBUTING.md
 - DOCUMENTING.md
 - Gemfile
-- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - MAINTAINERS
@@ -625,9 +536,12 @@ files:
 - docs/how_to/recipes.md
 - docs/how_to/run_in_parallel.md
 - docs/how_to/ssh_agent_forwarding.md
+- docs/how_to/test_arbitrary_beaker_versions.md
 - docs/how_to/the_beaker_dsl.md
+- docs/how_to/upgrade_from_2_to_3.md
 - docs/how_to/use_user_password_authentication.md
 - docs/how_to/write_a_beaker_test_for_a_module.md
+- docs/tutorials/README.md
 - docs/tutorials/creating_a_test_environment.md
 - docs/tutorials/how_to_beaker.md
 - docs/tutorials/installation.md
@@ -700,7 +614,6 @@ files:
 - lib/beaker/host/windows/user.rb
 - lib/beaker/host_prebuilt_steps.rb
 - lib/beaker/hypervisor.rb
-- lib/beaker/hypervisor/aixer.rb
 - lib/beaker/hypervisor/aws_sdk.rb
 - lib/beaker/hypervisor/docker.rb
 - lib/beaker/hypervisor/ec2_helper.rb
@@ -709,7 +622,6 @@ files:
 - lib/beaker/hypervisor/google_compute_helper.rb
 - lib/beaker/hypervisor/noop.rb
 - lib/beaker/hypervisor/openstack.rb
-- lib/beaker/hypervisor/solaris.rb
 - lib/beaker/hypervisor/vagrant.rb
 - lib/beaker/hypervisor/vagrant_custom.rb
 - lib/beaker/hypervisor/vagrant_fusion.rb
@@ -792,7 +704,6 @@ files:
 - spec/beaker/host/windows_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb
-- spec/beaker/hypervisor/aixer_spec.rb
 - spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
@@ -800,7 +711,6 @@ files:
 - spec/beaker/hypervisor/hypervisor_spec.rb
 - spec/beaker/hypervisor/hypervisor_spec.rb.orig
 - spec/beaker/hypervisor/openstack_spec.rb
-- spec/beaker/hypervisor/solaris_spec.rb
 - spec/beaker/hypervisor/vagrant_custom_spec.rb
 - spec/beaker/hypervisor/vagrant_fusion_spec.rb
 - spec/beaker/hypervisor/vagrant_libvirt_spec.rb

data/lib/beaker/hypervisor/aixer.rb

@@ -1,48 +0,0 @@
-module Beaker
-  class Aixer < Beaker::Hypervisor
-
-    def initialize(aix_hosts, options)
-      @options = options
-      @logger = options[:logger]
-      @hosts = aix_hosts
-      #aix machines are reverted to known state, not a snapshot
-      @fog_file = nil
-      if File.exists?( @options[:dot_fog] )
-        @fog_file = YAML.load_file( @options[:dot_fog] )
-      end
-      raise "Cant load #{@options[:dot_fog]} config" unless @fog_file
-
-    end
-
-    def provision
-      # Running the rake task on rpm-builder
-      hypername = @fog_file[:default][:aix_hypervisor_server]
-      hyperopts = @options.dup
-      hyperopts['HOSTS'] = {
-          hypername => { 'platform' => 'el-6-x86_64' }
-      }
-
-      @logger.notify "Connecting to hypervisor at #{hypername}"
-      hypervisor = Beaker::Host.create( hypername, hyperopts, @options )
-      hypervisor[:user] = @fog_file[:default][:aix_hypervisor_username] || hypervisor[:user]
-      hypervisor[:ssh][:keys] = [@fog_file[:default][:aix_hypervisor_keyfile]] || hypervisor[:ssh][:keys]
-
-      @hosts.each do |host|
-        vm_name = host['vmname'] || host.name
-
-        @logger.notify "Reverting #{vm_name} to aix clean state"
-        start = Time.now
-        # Restore AIX image, ID'd by the hostname
-        hypervisor.exec(Command.new("cd pe-aix && rake restore:#{host.name}"))
-        time = Time.now - start
-        @logger.notify "Spent %.2f seconds reverting" % time
-      end
-      hypervisor.close
-    end
-
-    def cleanup
-      @logger.notify "No cleanup for aix boxes"
-    end
-
-  end
-end