diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 14:16:49 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-19 14:16:49 -0700 |
| commit | 21c5929aae899e559e9a813c48424da4fcbec54b (patch) | |
| tree | fa90342427d0cd41c6aea56df8d89d2deb3def9d /spec/unit/parser/compiler_spec.rb | |
| parent | d69bf48ecae71ff01679bb38cdeebc8f4a8b8b15 (diff) | |
| parent | 0e4ae653c0628cb0df9ccace98bca4bc7478fb7c (diff) | |
| download | puppet-21c5929aae899e559e9a813c48424da4fcbec54b.tar.gz puppet-21c5929aae899e559e9a813c48424da4fcbec54b.tar.xz puppet-21c5929aae899e559e9a813c48424da4fcbec54b.zip | |
Merge branch 'feature/master/8268-puppet-agent-windows'
* feature/master/8268-puppet-agent-windows:
Maint: Fix miscellaneous tests
Maint: Don't test for extended signals on Windows
Maint: Tagged spec tests that are known to fail on Windows
Fix tests with "relative" paths on Windows
(#8268) Require windows drive letters in absolute file paths
(#8489) Consistently use File::PATH_SEPARATOR
Diffstat (limited to 'spec/unit/parser/compiler_spec.rb')
| -rwxr-xr-x | spec/unit/parser/compiler_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/parser/compiler_spec.rb b/spec/unit/parser/compiler_spec.rb index e6f481114..411d1b862 100755 --- a/spec/unit/parser/compiler_spec.rb +++ b/spec/unit/parser/compiler_spec.rb @@ -43,6 +43,8 @@ class CompilerTestResource end describe Puppet::Parser::Compiler do + include PuppetSpec::Files + def resource(type, title) Puppet::Parser::Resource.new(type, title, :scope => @scope) end @@ -413,7 +415,7 @@ describe Puppet::Parser::Compiler do end it "should fail to add resources that conflict with existing resources" do - path = Puppet.features.posix? ? "/foo" : "C:/foo" + path = make_absolute("/foo") file1 = Puppet::Type.type(:file).new :path => path file2 = Puppet::Type.type(:file).new :path => path |