Skip to content

Commit

Permalink
(SIMP-6536) Replace simpcat with concat in fixtures (#22)
Browse files Browse the repository at this point in the history
- Fixed tests that were failing because of a deps change
- Consolidated .fixtures*yml files

SIMP-6536 #comment Fix pupmod-simp-resolv tests
  • Loading branch information
lnemsick-simp authored and jeannegreulich committed May 3, 2019
1 parent 87913d1 commit 5804884
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
5 changes: 4 additions & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ fixtures:
repositories:
named: "https://github.com/simp/pupmod-simp-named.git"
rsync: "https://github.com/simp/pupmod-simp-rsync.git"
selinux_core:
repo: "https://github.com/simp/pupmod-puppetlabs-selinux_core"
puppet_version: ">= 6.0.0"
stdlib: "https://github.com/simp/puppetlabs-stdlib.git"
simplib: "https://github.com/simp/pupmod-simp-simplib.git"
simpcat: "https://github.com/simp/pupmod-simp-simpcat.git"
concat: "https://github.com/simp/puppetlabs-concat.git"
symlinks:
resolv: "#{source_dir}"
11 changes: 0 additions & 11 deletions .fixtures6.yml

This file was deleted.

6 changes: 0 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
require 'simp/rake/pupmod/helpers'
require 'puppet-strings/tasks'

unless ENV['FIXTURES_YML']
if Gem::Version.new(Puppet.version) >= Gem::Version.new('6')
ENV['FIXTURES_YML'] = File.join(File.dirname(__FILE__), '.fixtures6.yml')
end
end

Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))

0 comments on commit 5804884

Please sign in to comment.