diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-26 14:57:33 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-26 14:57:33 -0700 |
| commit | 770e30d620271f988321ea45c108fb167ab55ad7 (patch) | |
| tree | 48a4bcd382919164b3938e9a20de97cf6ab89a2b /spec/unit/node | |
| parent | b13427b56d8529731d0334d420b24a592ecb43ea (diff) | |
| parent | 9279d0954eb20d75e18a666fd572b5492e157608 (diff) | |
Merge branch 'feature/master/8268-puppet-agent-windows'
* feature/master/8268-puppet-agent-windows:
Fix issue with forward and backslashes in Windows paths
Disable spec tests for unsupported functionality on Windows
Update certificate spec tests for Windows
Diffstat (limited to 'spec/unit/node')
| -rwxr-xr-x | spec/unit/node/environment_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/node/environment_spec.rb b/spec/unit/node/environment_spec.rb index eb20aa7ef..78d383440 100755 --- a/spec/unit/node/environment_spec.rb +++ b/spec/unit/node/environment_spec.rb @@ -144,7 +144,7 @@ describe Puppet::Node::Environment do FileTest.stubs(:directory?).returns true env = Puppet::Node::Environment.new("testing") - two = File.join(Dir.getwd, "two") + two = File.expand_path(File.join(Dir.getwd, "two")) env.validate_dirs([@path_one, 'two']).should == [@path_one, two] end end |