Permalink
Browse files

expand_path

  • Loading branch information...
1 parent c80924c commit e6991412a336fd774426fa33ba850307106dc604 Tim Sharpe committed Oct 2, 2012
View
@@ -17,6 +17,6 @@ env:
matrix:
exclude:
- rvm: 1.9.2
- env: PUPPET_VERSION=2.6.14
+ env: PUPPET_VERSION=2.6.17
- rvm: 1.9.3
- env: PUPPET_VERSION=2.6.14
+ env: PUPPET_VERSION=2.6.17
@@ -10,7 +10,7 @@ def subject
def catalogue
vardir = Dir.mktmpdir
Puppet[:vardir] = vardir
- Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == "/dev/null"
+ Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
@@ -12,6 +12,7 @@ def catalogue
vardir = Dir.mktmpdir
Puppet[:vardir] = vardir
+ Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest
@@ -10,6 +10,7 @@ def subject
def catalogue
vardir = Dir.mktmpdir
Puppet[:vardir] = vardir
+ Puppet[:hiera_config] = File.join(vardir, "hiera.yaml") if Puppet[:hiera_config] == File.expand_path("/dev/null")
Puppet[:modulepath] = self.respond_to?(:module_path) ? module_path : RSpec.configuration.module_path
Puppet[:manifestdir] = self.respond_to?(:manifest_dir) ? manifest_dir : RSpec.configuration.manifest_dir
Puppet[:manifest] = self.respond_to?(:manifest) ? manifest : RSpec.configuration.manifest

0 comments on commit e699141

Please sign in to comment.