(#8489) Consistently use File::PATH_SEPARATOR

Puppet uses both colon and File::PATH_SEPARATOR in various places, which
does not work on Windows, where File::PATH_SEPARATOR is a semi-colon. This
commit changes the code and tests to consistently use File::PATH_SEPARATOR.

Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/spec/unit/indirector/resource_type/parser_spec.rb b/spec/unit/indirector/resource_type/parser_spec.rb
index c4fc455a0..fa2aa10b8 100755
--- a/spec/unit/indirector/resource_type/parser_spec.rb
+++ b/spec/unit/indirector/resource_type/parser_spec.rb
@@ -128,7 +128,7 @@ describe Puppet::Indirector::ResourceType::Parser do
       second = File.join(dir, "second")
       FileUtils.mkdir_p(first)
       FileUtils.mkdir_p(second)
-      Puppet[:modulepath] = "#{first}:#{second}"
+      Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
       # Make a new request, since we've reset the env
       @request = Puppet::Indirector::Request.new(:resource_type, :search, "*")
diff --git a/spec/unit/module_spec.rb b/spec/unit/module_spec.rb
index 8d38657f9..d1d01a1aa 100755
--- a/spec/unit/module_spec.rb
+++ b/spec/unit/module_spec.rb
@@ -275,7 +275,7 @@ describe Puppet::Module do
 
     FileUtils.mkdir_p(first)
     FileUtils.mkdir_p(second)
-    Puppet[:modulepath] = "#{first}:#{second}"
+    Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
     modpath = File.join(first, "foo")
     FileUtils.mkdir_p(modpath)
@@ -294,7 +294,7 @@ describe Puppet::Module do
 
     FileUtils.mkdir_p(first)
     FileUtils.mkdir_p(second)
-    Puppet[:modulepath] = "#{first}:#{second}"
+    Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
     modpath = File.join(second, "foo")
     FileUtils.mkdir_p(modpath)
diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb
index 9367b61c8..58caeda05 100755
--- a/spec/unit/parser/type_loader_spec.rb
+++ b/spec/unit/parser/type_loader_spec.rb
@@ -102,7 +102,7 @@ describe Puppet::Parser::TypeLoader do
       @modulebase2 = File.join(@base, "second")
       FileUtils.mkdir_p(@modulebase2)
 
-      Puppet[:modulepath] = "#{@modulebase1}:#{@modulebase2}"
+      Puppet[:modulepath] = "#{@modulebase1}#{File::PATH_SEPARATOR}#{@modulebase2}"
     end
 
     def mk_module(basedir, name)