beaker 2.44.0 → 2.45.0

data/spec/beaker/options/parser_spec.rb

@@ -153,7 +153,7 @@ module Beaker
             parser.instance_variable_set(:@command_line_parser, command_line_parser_obj)
 
             allow(OptionsFileParser).to receive(:parse_options_file).and_return(opt_file)
-            allow(HostsFileParser).to receive(:parse_hosts_file).and_return(host_file)
+            allow(parser).to receive(:parse_hosts_options).and_return(host_file)
           end
 
           it 'presets have the lowest priority' do
@@ -221,6 +221,98 @@ module Beaker
 
       end
 
+      describe '#parse_hosts_options' do
+
+        context 'Hosts file exists' do
+          before :each do
+            allow(File).to receive(:exists?).and_return(true)
+          end
+
+          it 'returns the parser\'s output' do
+            parser.instance_variable_set( :@options, {} )
+            test_value = 'blaqwetjijl,emikfuj1235'
+            allow( Beaker::Options::HostsFileParser ).to receive(
+              :parse_hosts_file
+            ).and_return( test_value )
+            val1, _ = parser.parse_hosts_options
+            expect( val1 ).to be === test_value
+          end
+        end
+
+        context 'Hosts file does not exist' do
+          require 'beaker-hostgenerator'
+          before :each do
+            allow(File).to receive(:exists?).and_return(false)
+          end
+
+          it 'calls beaker-hostgenerator to get hosts information' do
+            parser.instance_variable_set( :@options, {} )
+            allow( Beaker::Options::HostsFileParser ).to receive(
+              :parse_hosts_file
+            ).and_raise( Errno::ENOENT )
+
+            mock_beaker_hostgenerator_cli = Object.new
+            cli_execute_return = 'job150865'
+            expect( mock_beaker_hostgenerator_cli ).to receive(
+              :execute
+            ).and_return( cli_execute_return )
+            expect( BeakerHostGenerator::CLI ).to receive(
+              :new
+            ).and_return( mock_beaker_hostgenerator_cli )
+            allow( Beaker::Options::HostsFileParser ).to receive(
+              :parse_hosts_string
+            ).with( cli_execute_return )
+            parser.parse_hosts_options
+          end
+
+          it 'sets the :hosts_file_generated flag to signal others when needed' do
+            options_test = {}
+            parser.instance_variable_set( :@options, options_test )
+            allow( Beaker::Options::HostsFileParser ).to receive(
+              :parse_hosts_file
+            ).and_raise( Errno::ENOENT )
+
+            mock_beaker_hostgenerator_cli = Object.new
+            allow( mock_beaker_hostgenerator_cli ).to receive( :execute )
+            allow( BeakerHostGenerator::CLI ).to receive(
+              :new
+            ).and_return( mock_beaker_hostgenerator_cli )
+            allow( Beaker::Options::HostsFileParser ).to receive( :parse_hosts_string )
+            parser.parse_hosts_options
+
+            expect( options_test[:hosts_file_generated] ).to be true
+          end
+
+          it 'beaker-hostgenerator failures trigger nice prints & a rethrow' do
+            options_test = {}
+            parser.instance_variable_set( :@options, options_test )
+            allow( Beaker::Options::HostsFileParser ).to receive(
+              :parse_hosts_file
+            ).and_raise( Errno::ENOENT )
+
+            mock_beaker_hostgenerator_cli = Object.new
+            expect( BeakerHostGenerator::CLI ).to receive(
+              :new
+            ).and_return( mock_beaker_hostgenerator_cli )
+            expect( mock_beaker_hostgenerator_cli ).to receive(
+              :execute
+            ).and_raise( BeakerHostGenerator::Exceptions::InvalidNodeSpecError )
+            expect( Beaker::Options::HostsFileParser ).not_to receive( :parse_hosts_string )
+            expect( $stdout ).to receive( :puts ).with(
+              /does not exist/
+            ).ordered
+            expect( $stderr ).to receive( :puts ).with(
+              /Exiting with an Error/
+            ).ordered
+
+            expect {
+              parser.parse_hosts_options
+            }.to raise_error( BeakerHostGenerator::Exceptions::InvalidNodeSpecError )
+          end
+        end
+
+      end
+
       context "set_default_host!" do
 
         let(:roles) { @roles || [["master", "agent", "database"], ["agent"]] }

data/spec/helpers.rb

@@ -26,7 +26,6 @@ end
 
 module HostHelpers
   HOST_DEFAULTS = { :platform => 'unix',
-                    :snapshot => 'pe',
                     :roles => ['agent'],
                     :snapshot => 'snap',
                     :ip => 'default.ip.address',
@@ -34,6 +33,9 @@ module HostHelpers
                     :dns_name => 'default.box.tld',
                     :box => 'default_box_name',
                     :box_url => 'http://default.box.url',
+                    :image => 'default_image',
+                    :flavor => 'm1.large',
+                    :user_data => '#cloud-config\nmanage_etc_hosts: true\nfinal_message: "The host is finally up!"'
   }
 
   HOST_NAME     = "vm%d"
@@ -61,7 +63,13 @@ module HostHelpers
                                                :gce_project => 'beaker-compute',
                                                :gce_keyfile => '/path/to/keyfile.p12',
                                                :gce_password => 'notasecret',
-                                               :gce_email => '12345678910@developer.gserviceaccount.com' } )
+                                               :gce_email => '12345678910@developer.gserviceaccount.com',
+                                               :openstack_api_key => "P1as$w0rd",
+                                               :openstack_username => "user",
+                                               :openstack_auth_url => "http://openstack_hypervisor.labs.net:5000/v2.0/tokens",
+                                               :openstack_tenant => "testing",
+                                               :openstack_network => "testing",
+                                               :openstack_keyname => "nopass" } )
   end
 
   def generate_result (name, opts )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.44.0
+  version: 2.45.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -573,6 +573,7 @@ files:
 - acceptance/tests/load_path_bootstrap.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke_test.rb
+- acceptance/tests/puppet/web_helpers_test.rb
 - acceptance/tests/puppet/with_puppet_running_on.rb
 - beaker.gemspec
 - bin/beaker
@@ -588,7 +589,6 @@ files:
 - docs/How-To-Use-User-Password-Authentication-with-Beaker.md
 - docs/How-to-Write-a-Beaker-Test-for-a-Module.md
 - docs/Lets-Write-a-Test.md
-- docs/Overview.md
 - docs/README.md
 - docs/Roles-What-Are-They.md
 - docs/Shared-Options-for-Executing-Beaker-Commands.md
@@ -601,6 +601,7 @@ files:
 - docs/hosts/README.md
 - docs/hosts/cisco.md
 - docs/hosts/eos.md
+- docs/how_to/change_terminal_output_coloring.md
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
 - docs/hypervisors/docker.md
@@ -614,6 +615,7 @@ files:
 - docs/hypervisors/vsphere.md
 - docs/meta/README.md
 - docs/meta/ticket_process.md
+- docs/runner/test_run.md
 - docs/runner/test_suites.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
@@ -774,6 +776,7 @@ files:
 - spec/beaker/hypervisor/fusion_spec.rb
 - 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_fusion_spec.rb
 - spec/beaker/hypervisor/vagrant_libvirt_spec.rb

data/docs/Overview.md

@@ -1,31 +0,0 @@
-Beaker is an acceptance testing harness for Puppet PE and other Puppet Projects.  It can also be used as a virtual machine provisioner - setting up machines, running any configuration on those machines and then exiting.  
-
-Beaker goes through several phases when running tests
-
-* Provisioning
-  * skip with `--no-provision`
-  * Using supported hypervisors provision SUTs for testing on
-  * Do any initial configuration to ensure that the SUTs can communicate with beaker and each other
-* Validation
-  * skip with `--no-validate`
-  * Check the SUTs for necessary packages (curl, ntpdate)
-* Configuration
-  * skip with `--no-configure`
-  * Do any post-provisioning configuration to the test nodes
-* Testing
-  * Pre-Suite
-   * use `--pre-suite`
-   * Run any test files defined as part of the `--pre-suite` command line option
-  * Tests
-   * use `--tests`
-   * Run any test files defined as part of the `--tests` command line option
-  * Post-Suite
-   * use `--post-suite`
-   * Run any test files defined as part of the `--post-suite` command line option
-* Reverting
-  * Skip with `--preserve-hosts`
-  * Destroy and cleanup all SUTs
-* Cleanup
-  * Report test results
-
-Beaker runs tests written in Ruby with an additional DSL API.  This gives you access to all standard Ruby along with acceptance testing specific commands.