simp-beaker-helpers 1.2.1 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjliNTUyNTQzNzFkNjZkYWZlNjU2YTA3OGFjMWUyZGU3NWFiZGQ2Yw==
+    MDAxZjY1OTM4ZjRlYjZlM2RjMDNhM2MwNjFkMDgxYTdlYmFlYmZmMw==
   data.tar.gz: !binary |-
-    N2VlYzNjMGM3ZDMwZTk5Y2ZiOWE1OWJkODUyMzA1ODJmZjVlNDQwNw==
+    YTdmN2U2ZTMxMGQ2MTYzZGUzODJjNDAyYTFkZWUwOTBjOWIxNGE4Zg==
 SHA512:
   metadata.gz: !binary |-
-    NzU0ZjJmZTNlNmIwNzNlYzE4ZGE3YmFmZDc5MDUzMjIyMzE5M2JmNGUxMjJm
-    Zjc3MzU3NDhmZWYzYTJjMjA5ODc4MDJhYjUwYzAyMTA0NTNmOTYwM2IwYWQy
-    NzM4NWJmMjZjZTRmOWZmYzgwMDFjNzllOGVkOTA5ZjY4MTEwZDg=
+    ZDU4NTI0YTMyMGNhYTVjYTg2ODIyMjEyNzBiMzcwOTAxZDcwMTc3YTM0MWM5
+    M2U1NWFmYWMzMTUyNjIyOTMwZmZhNzM4MmM4MDM1M2QxNzU3MmNlN2U1YmVi
+    Mjg4NTliZTY1ZDBmNWYzYTdlMTJmMWI0YmJmNzcxMWM2YzcyYWM=
   data.tar.gz: !binary |-
-    OTc5YTI3YjBmYTI4NjU5ODcxN2FlYTE5Y2Y2NGU2NjlhMzg2NTk0NWQ1NDRl
-    NTdmZmMzYjFiMjNiYmI2OTExZmE1ZTQ0Mjg2ZDIxYTdmZWVhZDBjYzMzMjUw
-    NDc5ZWJiYjEyN2M4NjA1NzM3OTA2Y2U4ZTRmNjI0YTM5ZjA1YTE=
+    MDdmNmE2YmVmNzk2NjA4ZTg1MjE5NWMzNzViZTZhZGE0MzM1ZmNhYzY4NGNi
+    YzRhNGM0MzIwYjI3MmVkZDU3ZmYxMWY5NmNlOTQ0YjRmODA3NTA0N2YwMjQz
+    NmZmMWE0ZWJhZWFjNWEwMjhhYjNmNGRkODNiMzM4ODI1OTJkZjc=

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)

data/lib/simp/rake/beaker.rb

@@ -21,8 +21,8 @@ module Simp::Rake
 
       namespace :beaker do
         desc <<-EOM
-        Run a Beaker test against a specific Nodeset
-          * :nodeset - The nodeset against which you wish to run
+          Run a Beaker test against a specific Nodeset
+            * :nodeset - The nodeset against which you wish to run
         EOM
         task :run, [:nodeset] do |t,args|
           fail "You must pass :nodeset to #{t}" unless args[:nodeset]
@@ -44,6 +44,178 @@ module Simp::Rake
 
           Rake::Task['beaker'].invoke
         end
+
+        desc <<-EOM
+          Run Beaker test suites.
+            * :suite - A specific suite to run
+              * If you set this to `ALL`, all suites will be run
+
+            * :nodeset - A specific nodeset to run on within a specific suite
+
+            ## Suite Execution
+
+              By default the only suite that will be executed is `default`.
+              Since each suite is executed in a new environment, spin up can
+              take a lot of time. Therefore, the default is to only run the
+              default suite.
+
+              If there is a suite where the metadata contains `default_run` set
+              to the Boolean `true`, then that suite will be part of the
+              default suite execution.
+
+              You can run all suites by setting the passed suite name to `ALL`
+              (case sensitive).
+
+            ## Environment Variables
+
+              * BEAKER_suite_runall
+                * Run all Suites
+
+              * BEAKER_suite_basedir
+                * The base directory where suites will be defined
+                * Default: spec/acceptance
+
+            ## Global Suite Configuration
+              A file `config.yml` can be placed in the `suites` directory to
+              control certain aspects of the suite run.
+
+            ### Supported Config:
+
+              ```yaml
+              ---
+              # Fail the entire suite at the first failure
+              'fail_fast' : <true|false> => Default: true
+              ```
+            ## Individual Suite Configuration
+
+              Each suite may contain a YAML file, metadata.yml, which will be
+              used to provide information to the suite of tests.
+
+            ### Supported Config:
+
+              ```yaml
+              ---
+              'name' :        '<User friendly name for the suite>'
+
+              # Run this suite by default
+              'default_run' : <true|false> => Default: false
+              ```
+        EOM
+        task :suites, [:suite, :nodeset] do |t,args|
+          suite = args[:suite]
+          nodeset = args[:nodeset]
+
+          # Record Tasks That Fail
+          # Need to figure out how to capture the errors
+          failures = Hash.new
+
+          suite_basedir = 'spec/acceptance/suites'
+          if ENV['BEAKER_suite_basedir']
+            suite_basedir = ENV['BEAKER_suite_basedir']
+          end
+
+          raise("Error: Suites Directory at '#{suite_basedir}'!") unless File.directory?(suite_basedir)
+
+          suite_config = {
+            'fail_fast' => true
+          }
+          suite_config_metadata_path = File.join(suite_basedir, 'config.yml')
+          if File.file?(suite_config_metadata_path)
+            suite_config.merge!(YAML.load_file(suite_config_metadata_path))
+          end
+
+          suites = Hash.new
+          if suite
+            suites[suite] = Hash.new
+          else
+            Dir.glob(File.join(suite_basedir,'*')) do |file|
+              if File.directory?(file)
+                suites[File.basename(file)] = Hash.new
+              end
+            end
+          end
+
+          suites.keys.each do |ste|
+            suites[ste]['name']  = ste
+            suites[ste]['path']  = File.join(suite_basedir, ste)
+
+            metadata_path = File.join(suites[ste]['path'], 'metadata.yml')
+            if File.file?(metadata_path)
+              suites[ste]['metadata'] = YAML.load_file(metadata_path)
+            end
+
+            unless File.directory?(File.join(suites[ste]['path'],'nodesets'))
+              Dir.chdir(suites[ste]['path']) do
+                if File.directory?('../../nodesets')
+                  FileUtils.ln_s('../../nodesets', 'nodesets')
+                end
+              end
+            end
+
+            suites[ste].merge!(suites[ste]['metadata']) if suites[ste]['metadata']
+
+            # Ensure that the 'default' suite runs unless explicitly disabled.
+            if suites['default']
+              if ( suites['default']['default_run'].nil? ) || ( suites['default']['default_run'] == true )
+                suites['default']['default_run'] = true
+              end
+            end
+          end
+
+          raise("Error: No Suites Found in '#{suite_basedir}'!") if suites.empty?
+
+          # Need to ensure that 'default' is first
+          ordered_suites = suites.keys.sort
+          default_suite = ordered_suites.delete('default')
+          ordered_suites.unshift(default_suite) if default_suite
+
+          ordered_suites.each do |ste|
+
+            next unless (suites[ste]['default_run'] == true)
+
+            name = suites[ste]['name']
+
+            $stdout.puts("\n\n=== Suite '#{name}' Starting ===\n\n")
+
+            if nodeset
+              unless File.file?(File.join(suites[ste]['path'],"#{nodeset}.yml"))
+                $stdout.puts("=== Suite #{name} Nodeset '#{nodeset}' Not Found, Skipping ===")
+                next
+              end
+
+              ENV['BEAKER_set'] = nodeset
+            end
+
+            Rake::Task[:beaker].clear
+            RSpec::Core::RakeTask.new(:beaker) do |tsk|
+              tsk.rspec_opts = ['--color']
+              tsk.pattern = File.join(suites[ste]['path'])
+            end
+
+            current_suite_task = Rake::Task[:beaker]
+
+            if suite_config['fail_fast'] == true
+              current_suite_task.execute
+            else
+              begin
+                current_suite_task.execute
+              rescue SystemExit
+                failures[suites[ste]['name']] = {
+                  'path' => suites[ste]['path']
+                }
+              end
+            end
+
+            $stdout.puts("\n\n=== Suite '#{name}' Complete ===\n\n")
+          end
+
+          unless failures.keys.empty?
+            $stdout.puts("The following tests had failures:")
+            failures.keys.sort.each do |ste|
+              $stdout.puts("  * #{ste} => #{failures[ste]['path']}")
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker