puppetlabs_spec_helper 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f488df4c706569eee6e7f47135359abbb222391b
-  data.tar.gz: bcc3ef4e868d31908422dec50ff9ab0bc7857269
+  metadata.gz: e45684c9216162f69c0dd3afd5d8dff52c4cd5b7
+  data.tar.gz: 2f37f0da9a4cac0d58df5612dc966a1f6a112c2d
 SHA512:
-  metadata.gz: c2622f2e64e0eab60e978d9dcf4087dc58cb4236dd091327744358c6253cf2a4ae94691b70bcf4beb2b7f84639659a4e861a77f1e29326a5b8ed2891bdbd77b2
-  data.tar.gz: 56c5b8c957e30886a3bd3b672d0a46e4ab5d0f71071282ef4da04c79e36087d85d575f2bee2150b0e6c217c5d958cc070b4b66e61d8519072c112e65450945f1
+  metadata.gz: de629171b63520b5245ac177521fe9f7cd37298d30957a1c9740916f74f572f8c18e15724471ea5bd63d6b4117dc31d059b9118ca00d7551dc98b1203410a49b
+  data.tar.gz: 34db93d7c4df67c8011672c04e76290f68aa20d1fd1eff673f83a8215fb66da534b345d95ecc3d4c6fdf352f669e4c491b8def5a1b14dbc21bd5d7526537d3e6

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.4.0]
+### Summary
+Fix mercurial stuff, allow fixtures other than spec/fixtures/modules/, and allow running specific tags for beaker tests.
+
+### Added
+- Ability to check out branches in mercurial
+- Ability to target alternative locations to clone fixtures
+- `TEST_TIERS` environment variable for beaker rake task
+
+### Fixed
+- mercurial cleanup command
+- handle parallel spec load failure better
+
 ## [2.3.2]
 ### Summary
 Cleanups and fixes around fixture handling.
@@ -385,7 +398,8 @@ compatible yet.
 ### Added
  * Initial release
 
-[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.2...master
+[unreleased]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.4.0...master
+[2.4.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.2...v2.4.0
 [2.3.2]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/puppetlabs/puppetlabs_spec_helper/compare/v2.2.0...v2.3.0

data/README.md

@@ -240,6 +240,18 @@ fixtures:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
 ```
 
+Put a supplementary repository at a different location
+
+```yaml
+fixtures:
+  repositories:
+    firewall: "git://github.com/puppetlabs/puppetlabs-firewall"
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
+    control_repo:
+      repo: "https://github.com/puppetlabs/control-repo"
+      target: "spec/fixtures/control_repos"
+```
+
 Specify that the git tag `2.4.2` of `stdlib' should be checked out:
 
 ```yaml
@@ -333,6 +345,16 @@ remembering to duplicate any existing environment variables:
     env:
       - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=1
       - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=2
+      
+#### Running tests tagged with test tiers
+To run tests tagged with risk levels set the ``TEST_TIERS`` environment variable to a comma-separated list of 
+the appropriate tiers.
+
+For example: to run tests marked ``tier_high => true`` and ``tier_medium => true`` in the same test run set the 
+environment variable``TEST_TIERS=high,medium``
+  
+Note, if the ``TEST_TIERS`` environment variable is set to empty string or nil, all tiers will be executed.
+
 
 Generating code coverage reports
 ================================

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -12,6 +12,15 @@ rescue LoadError
   # ignore
 end
 
+parallel_tests_loaded = false
+begin
+  require 'parallel_tests'
+  parallel_tests_loaded = true
+rescue LoadError
+  # ignore
+end
+
+
 task :default => [:help]
 
 pattern = 'spec/{aliases,classes,defines,unit,functions,hosts,integration,type_aliases,types}/**/*_spec.rb'
@@ -46,6 +55,20 @@ desc "Run beaker acceptance tests"
 RSpec::Core::RakeTask.new(:beaker) do |t|
   t.rspec_opts = ['--color']
   t.pattern = 'spec/acceptance'
+  # TEST_TIERS env variable is a comma separated list of tiers to run. e.g. low, medium, high
+  if ENV['TEST_TIERS']
+    tiers = '--tag '
+    test_tiers = ENV['TEST_TIERS'].split(',')
+    raise 'TEST_TIERS env variable must have at least 1 tier specified. low, medium or high (comma separated).' if test_tiers.count == 0
+    test_tiers.each do |tier|
+      raise "#{tier} not a valid test tier." unless %w(low medium high).include?(tier)
+      tiers += "tier_#{tier},"
+    end
+    tiers = tiers.chomp(',')
+    t.rspec_opts.push(tiers)
+  else
+    puts 'TEST_TIERS env variable not defined. Defaulting to run all tests.'
+  end
 end
 
 # This is a helper for the self-symlink entry of fixtures.yml
@@ -134,9 +157,18 @@ def fixtures(category)
         real_source = eval('"'+source+'"')
         result[real_source] = target
       elsif opts.instance_of?(Hash)
-        target = "spec/fixtures/modules/#{fixture}"
+
+        if opts["target"]
+          real_target = eval('"'+opts["target"]+'"')
+        end
+
+        unless real_target
+          real_target = "spec/fixtures/modules"
+        end
+
         real_source = eval('"'+opts["repo"]+'"')
-        result[real_source] = { "target" => target, "ref" => opts["ref"], "branch" => opts["branch"], "scm" => opts["scm"], "flags" => opts["flags"], "subdir" => opts["subdir"]}
+
+        result[real_source] = { "target" => File.join(real_target,fixture), "ref" => opts["ref"], "branch" => opts["branch"], "scm" => opts["scm"], "flags" => opts["flags"], "subdir" => opts["subdir"]}
       end
     end
   end
@@ -148,7 +180,7 @@ def clone_repo(scm, remote, target, subdir=nil, ref=nil, branch=nil, flags = nil
   case scm
   when 'hg'
     args.push('clone')
-    args.push('-u', ref) if ref
+    args.push('-b', branch) if branch
     args.push(flags) if flags
     args.push(remote, target)
   when 'git'
@@ -171,7 +203,7 @@ def revision(scm, target, ref)
   args = []
   case scm
   when 'hg'
-    args.push('update', 'clean', '-r', ref)
+    args.push('update', '--clean', '-r', ref)
   when 'git'
     args.push('reset', '--hard', ref)
   else
@@ -379,17 +411,14 @@ end
 
 desc "Parallel spec tests"
 task :parallel_spec do
+  raise 'Add the parallel_tests gem to Gemfile to enable this task' unless parallel_tests_loaded
   begin
-    require 'parallel_tests'
-
     args = ['-t', 'rspec']
     args.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split(' ')).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
     args.concat(Rake::FileList[pattern].to_a)
 
     Rake::Task[:spec_prep].invoke
     ParallelTests::CLI.new.run(args)
-  rescue LoadError
-    raise 'Add the parallel_tests gem to Gemfile to enable this task'
   ensure
     Rake::Task[:spec_clean].invoke
   end
@@ -529,7 +558,7 @@ task :compute_dev_version do
   if build = ENV['BUILD_NUMBER'] || ENV['TRAVIS_BUILD_NUMBER']
     if branch.eql? "release"
       new_version = sprintf('%s-%s%04d-%s', version, "r", build, sha)
-    else 
+    else
       new_version = sprintf('%s-%04d-%s', version, build, sha)
     end
   else
@@ -543,9 +572,9 @@ desc "Runs all necessary checks on a module in preparation for a release"
 task :release_checks do
   Rake::Task[:lint].invoke
   Rake::Task[:validate].invoke
-  begin
+  if parallel_tests_loaded
     Rake::Task[:parallel_spec].invoke
-  rescue RuntimeError
+  else
     Rake::Task[:spec].invoke
   end
   Rake::Task["check:symlinks"].invoke

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 
   # compat for pre-1.2.0 users; deprecated
   module Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Standard tasks and configuration for module spec tests.