puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/spec/fixtures/unit/pops/parser/lexer/classincludes.pp

@@ -1,15 +1,15 @@
 # $Id$
 
 class base {
-    file { "/tmp/classincludes1": ensure => file, mode => 755 }
+    file { "/tmp/classincludes1": ensure => file, mode => '0755' }
 }
 
 class sub1 inherits base {
-    file { "/tmp/classincludes2": ensure => file, mode => 755 }
+    file { "/tmp/classincludes2": ensure => file, mode => '0755' }
 }
 
 class sub2 inherits base {
-    file { "/tmp/classincludes3": ensure => file, mode => 755 }
+    file { "/tmp/classincludes3": ensure => file, mode => '0755' }
 }
 
 $sub = "sub2"

data/spec/fixtures/unit/pops/parser/lexer/classpathtest.pp

@@ -1,7 +1,7 @@
 # $Id$
 
 define mytype {
-    file { "/tmp/classtest": ensure => file, mode => 755 }
+    file { "/tmp/classtest": ensure => file, mode => '0755' }
 }
 
 class testing {

data/spec/fixtures/unit/pops/parser/lexer/collection_override.pp

@@ -4,5 +4,5 @@
 }
 
 File<| |> {
-    mode => 0600
+    mode => '0600'
 }

data/spec/fixtures/unit/pops/parser/lexer/componentrequire.pp

@@ -2,7 +2,7 @@ define testfile($mode) {
     file { $name: mode => $mode, ensure => present }
 }
 
-testfile { "/tmp/testing_component_requires2": mode => 755 }
+testfile { "/tmp/testing_component_requires2": mode => '0755' }
 
-file { "/tmp/testing_component_requires1": mode => 755, ensure => present,
+file { "/tmp/testing_component_requires1": mode => '0755', ensure => present,
     require => Testfile["/tmp/testing_component_requires2"] }

data/spec/fixtures/unit/pops/parser/lexer/deepclassheirarchy.pp

@@ -1,23 +1,23 @@
 # $Id$
 
 class base {
-    file { "/tmp/deepclassheir1": ensure => file, mode => 755 }
+    file { "/tmp/deepclassheir1": ensure => file, mode => '0755' }
 }
 
 class sub1 inherits base {
-    file { "/tmp/deepclassheir2": ensure => file, mode => 755 }
+    file { "/tmp/deepclassheir2": ensure => file, mode => '0755' }
 }
 
 class sub2 inherits sub1 {
-    file { "/tmp/deepclassheir3": ensure => file, mode => 755 }
+    file { "/tmp/deepclassheir3": ensure => file, mode => '0755' }
 }
 
 class sub3 inherits sub2 {
-    file { "/tmp/deepclassheir4": ensure => file, mode => 755 }
+    file { "/tmp/deepclassheir4": ensure => file, mode => '0755' }
 }
 
 class sub4 inherits sub3 {
-    file { "/tmp/deepclassheir5": ensure => file, mode => 755 }
+    file { "/tmp/deepclassheir5": ensure => file, mode => '0755' }
 }
 
 include sub4

data/spec/fixtures/unit/pops/parser/lexer/defineoverrides.pp

@@ -7,11 +7,11 @@ define myfile($mode) {
 }
 
 class base {
-    myfile { $file: mode => 644 }
+    myfile { $file: mode => '0644' }
 }
 
 class sub inherits base {
-    Myfile[$file] { mode => 755, } # test the end-comma
+    Myfile[$file] { mode => '0755', } # test the end-comma
 }
 
 include sub

data/spec/fixtures/unit/pops/parser/lexer/filecreate.pp

@@ -1,8 +1,8 @@
 # $Id$
 
 file {
-    "/tmp/createatest": ensure => file, mode => 755;
-    "/tmp/createbtest": ensure => file, mode => 755
+    "/tmp/createatest": ensure => file, mode => '0755';
+    "/tmp/createbtest": ensure => file, mode => '0755'
 }
 
 file {

data/spec/fixtures/unit/pops/parser/lexer/ifexpression.pp

@@ -7,6 +7,6 @@ if ($one < $two) and (($two < 3) or ($two == 2)) {
 
 if "test regex" =~ /(.*) regex/ {
     file {
-        "/tmp/${1}iftest": ensure => file, mode => 0755
+        "/tmp/${1}iftest": ensure => file, mode => '0755'
     }
 }

data/spec/fixtures/unit/pops/parser/lexer/implicititeration.pp

@@ -2,14 +2,14 @@
 
 $files = ["/tmp/iterationatest", "/tmp/iterationbtest"]
 
-file { $files: ensure => file, mode => 755 }
+file { $files: ensure => file, mode => '0755' }
 
 file { ["/tmp/iterationctest", "/tmp/iterationdtest"]:
     ensure => file,
-    mode => 755
+    mode => '0755'
 }
 
 file {
-    ["/tmp/iterationetest", "/tmp/iterationftest"]: ensure => file, mode => 755;
-    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: ensure => file, mode => 755;
+    ["/tmp/iterationetest", "/tmp/iterationftest"]: ensure => file, mode => '0755';
+    ["/tmp/iterationgtest", "/tmp/iterationhtest"]: ensure => file, mode => '0755';
 }

data/spec/fixtures/unit/pops/parser/lexer/multipleinstances.pp

@@ -1,7 +1,7 @@
 # $Id$
 
 file {
-    "/tmp/multipleinstancesa": ensure => file, mode => 755;
-    "/tmp/multipleinstancesb": ensure => file, mode => 755;
-    "/tmp/multipleinstancesc": ensure => file, mode => 755;
+    "/tmp/multipleinstancesa": ensure => file, mode => '0755';
+    "/tmp/multipleinstancesb": ensure => file, mode => '0755';
+    "/tmp/multipleinstancesc": ensure => file, mode => '0755';
 }

data/spec/fixtures/unit/pops/parser/lexer/multisubs.pp

@@ -1,9 +1,9 @@
 class base {
-    file { "/tmp/multisubtest": content => "base", mode => 644 }
+    file { "/tmp/multisubtest": content => "base", mode => '0644' }
 }
 
 class sub1 inherits base {
-    File["/tmp/multisubtest"] { mode => 755 }
+    File["/tmp/multisubtest"] { mode => '0755' }
 }
 
 class sub2 inherits base {

data/spec/fixtures/unit/pops/parser/lexer/namevartest.pp

@@ -5,5 +5,5 @@ define filetest($mode, $ensure = file) {
     }
 }
 
-filetest { "/tmp/testfiletest": mode => 644}
-filetest { "/tmp/testdirtest": mode => 755, ensure => directory}
+filetest { "/tmp/testfiletest": mode => '0644'}
+filetest { "/tmp/testdirtest": mode => '0755', ensure => directory}

data/spec/fixtures/unit/pops/parser/lexer/simpledefaults.pp

@@ -1,5 +1,5 @@
 # $Id$
 
-File { mode => 755 }
+File { mode => '0755' }
 
 file { "/tmp/defaulttest": ensure => file }

data/spec/fixtures/unit/provider/package/gem/gem-list-single-package

@@ -0,0 +1,4 @@
+
+*** REMOTE GEMS ***
+
+bundler (1.6.2)

data/spec/fixtures/unit/type/user/authorized_keys

@@ -1,5 +1,5 @@
 # fixture for testing ssh key purging
 
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTXvM7AslzjNUYrPLiNVBsF5VnqL2RmqrkzscdVdHzVxvieNwmLGeUkg8EfXPiz7j5F/Lr0J8oItTCWzyN2KmM+DhUMjvP4AbELO/VYbnVrZICRiUNYSO3EN9/uapKAuiev88d7ynbonCU0VZoTPg/ug4OondOrLCtcGri5ltF+mausGfAYiFAQVEWqXV+1tyejoawJ884etb3n4ilpsrH9JK6AtOkEWVD3TDrNi29O1mQQ/Cn88g472zAJ+DhsIn+iehtfX5nmOtDNN/1t1bGMIBzkSYEAYwUiRJbRXvbobT7qKZQPA3dh0m8AYQS5/hd4/c4pmlxL8kgr24SnBY5 key1 keyname1
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTXvM7AslzjNUYrPLiNVBsF5VnqL2RmqrkzscdVdHzVxvieNwmLGeUkg8EfXPiz7j5F/Lr0J8oItTCWzyN2KmM+DhUMjvP4AbELO/VYbnVrZICRiUNYSO3EN9/uapKAuiev88d7ynbonCU0VZoTPg/ug4OondOrLCtcGri5ltF+mausGfAYiFAQVEWqXV+1tyejoawJ884etb3n4ilpsrH9JK6AtOkEWVD3TDrNi29O1mQQ/Cn88g472zAJ+DhsIn+iehtfX5nmOtDNN/1t1bGMIBzkSYEAYwUiRJbRXvbobT7qKZQPA3dh0m8AYQS5/hd4/c4pmlxL8kgr24SnBY5 key1 name
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTXvM7AslzjNUYrPLiNVBsF5VnqL2RmqrkzscdVdHzVxvieNwmLGeUkg8EfXPiz7j5F/Lr0J8oItTCWzyN2KmM+DhUMjvP4AbELO/VYbnVrZICRiUNYSO3EN9/uapKAuiev88d7ynbonCU0VZoTPg/ug4OondOrLCtcGri5ltF+mausGfAYiFAQVEWqXV+1tyejoawJ884etb3n4ilpsrH9JK6AtOkEWVD3TDrNi29O1mQQ/Cn88g472zAJ+DhsIn+iehtfX5nmOtDNN/1t1bGMIBzkSYEAYwUiRJbRXvbobT7qKZQPA3dh0m8AYQS5/hd4/c4pmlxL8kgr24SnBY5 keyname2
 #ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTXvM7AslzjNUYrPLiNVBsF5VnqL2RmqrkzscdVdHzVxvieNwmLGeUkg8EfXPiz7j5F/Lr0J8oItTCWzyN2KmM+DhUMjvP4AbELO/VYbnVrZICRiUNYSO3EN9/uapKAuiev88d7ynbonCU0VZoTPg/ug4OondOrLCtcGri5ltF+mausGfAYiFAQVEWqXV+1tyejoawJ884etb3n4ilpsrH9JK6AtOkEWVD3TDrNi29O1mQQ/Cn88g472zAJ+DhsIn+iehtfX5nmOtDNN/1t1bGMIBzkSYEAYwUiRJbRXvbobT7qKZQPA3dh0m8AYQS5/hd4/c4pmlxL8kgr24SnBY5 keyname3

data/spec/integration/agent/logging_spec.rb

@@ -88,6 +88,10 @@ describe 'agent logging' do
     else
 
       it "when evoked with #{argv}, logs to #{expected[:loggers].inspect} at level #{expected[:level]}" do
+        if Facter.value(:kernelmajversion).to_f < 6.0
+          pending("requires win32-eventlog gem upgrade to 0.6.2 on Windows 2003")
+        end
+
         # This logger is created by the Puppet::Settings object which creates and
         # applies a catalog to ensure that configuration files and users are in
         # place.

data/spec/integration/application/doc_spec.rb

@@ -35,11 +35,12 @@ describe Puppet::Application::Doc do
       end
 
       puppet = Puppet::Application[:doc]
-      Puppet[:modulepath] = modules_dir
-      Puppet[:manifest] = site_file
       puppet.options[:mode] = :rdoc
 
-      expect { puppet.run_command }.to exit_with 0
+      env = Puppet::Node::Environment.create(:rdoc, [modules_dir], site_file) 
+      Puppet.override(:current_environment =>  env) do
+        expect { puppet.run_command }.to exit_with 0
+      end
 
       Puppet::FileSystem.exist?('doc').should be_true
     ensure

data/spec/integration/configurer_spec.rb

@@ -6,20 +6,6 @@ require 'puppet/configurer'
 describe Puppet::Configurer do
   include PuppetSpec::Files
 
-  describe "when downloading plugins" do
-    it "should use the :pluginsignore setting, split on whitespace, for ignoring remote files" do
-      Puppet.settings.stubs(:use)
-      resource = Puppet::Type.type(:notify).new :name => "yay"
-      Puppet::Type.type(:file).expects(:new).at_most(2).with do |args|
-        args[:ignore] == Puppet[:pluginsignore].split(/\s+/)
-      end.returns resource
-
-      configurer = Puppet::Configurer.new
-      configurer.stubs(:download_plugins?).returns true
-      configurer.download_plugins(Puppet::Node::Environment.remote(:testing))
-    end
-  end
-
   describe "when running" do
     before(:each) do
       @catalog = Puppet::Resource::Catalog.new("testing", Puppet.lookup(:environments).get(Puppet[:environment]))

data/spec/integration/defaults_spec.rb

@@ -5,6 +5,32 @@ require 'puppet/defaults'
 require 'puppet/rails'
 
 describe "Puppet defaults" do
+
+  describe "when default_manifest is set" do
+    it "returns ./manifests by default" do
+      expect(Puppet[:default_manifest]).to eq('./manifests')
+    end
+
+    it "errors when $environment is part of the value" do
+      expect {
+        Puppet[:default_manifest] = '/$environment/manifest.pp'
+      }.to raise_error Puppet::Settings::ValidationError, /cannot interpolate.*\$environment/
+    end
+  end
+
+  describe "when disable_per_environment_manifest is set" do
+    it "returns false by default" do
+      expect(Puppet[:disable_per_environment_manifest]).to eq(false)
+    end
+
+    it "errors when set to true and default_manifest is not an absolute path" do
+      expect {
+        Puppet[:default_manifest] = './some/relative/manifest.pp'
+        Puppet[:disable_per_environment_manifest] = true
+      }.to raise_error Puppet::Settings::ValidationError, /'default_manifest' setting must be.*absolute/
+    end
+  end
+
   describe "when setting the :factpath" do
     it "should add the :factpath to Facter's search paths" do
       Facter.expects(:search).with("/my/fact/path")

data/spec/integration/environments/default_manifest_spec.rb

@@ -0,0 +1,274 @@
+require 'spec_helper'
+
+module EnvironmentsDefaultManifestsSpec
+describe "default manifests" do
+  FS = Puppet::FileSystem
+
+  shared_examples_for "puppet with default_manifest settings" do
+    let(:confdir) { Puppet[:confdir] }
+    let(:environmentpath) { File.expand_path("envdir", confdir) }
+
+    context "relative default" do
+      let(:testingdir) { File.join(environmentpath, "testing") }
+
+      before(:each) do
+        FileUtils.mkdir_p(testingdir)
+      end
+
+      it "reads manifest from ./manifest of a basic directory environment" do
+        manifestsdir = File.join(testingdir, "manifests")
+        FileUtils.mkdir_p(manifestsdir)
+
+        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromRelativeDefault': }")
+        end
+
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts("environmentpath=#{environmentpath}")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromRelativeDefault]')
+        )
+      end
+    end
+
+    context "set absolute" do
+      let(:testingdir) { File.join(environmentpath, "testing") }
+
+      before(:each) do
+        FileUtils.mkdir_p(testingdir)
+      end
+
+      it "reads manifest from an absolute default_manifest" do
+        manifestsdir = File.expand_path("manifests", confdir)
+        FileUtils.mkdir_p(manifestsdir)
+
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=#{manifestsdir}
+          EOF
+        end
+
+        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromAbsoluteDefaultManifest]')
+        )
+      end
+
+      it "reads manifest from directory environment manifest when environment.conf manifest set" do
+        default_manifestsdir = File.expand_path("manifests", confdir)
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=#{default_manifestsdir}
+          EOF
+        end
+
+        manifestsdir = File.join(testingdir, "special_manifests")
+        FileUtils.mkdir_p(manifestsdir)
+
+        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromEnvironmentConfManifest': }")
+        end
+
+        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+          f.puts("manifest=./special_manifests")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromEnvironmentConfManifest]')
+        )
+        expect(Puppet[:default_manifest]).to eq(default_manifestsdir)
+      end
+
+      it "ignores manifests in the local ./manifests if default_manifest specifies another directory" do
+        default_manifestsdir = File.expand_path("manifests", confdir)
+        FileUtils.mkdir_p(default_manifestsdir)
+
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=#{default_manifestsdir}
+          EOF
+        end
+
+        File.open(File.join(default_manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
+        end
+
+        implicit_manifestsdir = File.join(testingdir, "manifests")
+        FileUtils.mkdir_p(implicit_manifestsdir)
+
+        File.open(File.join(implicit_manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromImplicitRelativeEnvironmentManifestDirectory': }")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromAbsoluteDefaultManifest]')
+        )
+      end
+
+      it "raises an exception if default_manifest has $environment in it" do
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=/foo/$environment
+          EOF
+        end
+
+        expect { Puppet.initialize_settings }.to raise_error(Puppet::Settings::ValidationError, /cannot interpolate.*\$environment.*in.*default_manifest/)
+      end
+    end
+
+    context "with disable_per_environment_manifest true" do
+      let(:manifestsdir) { File.expand_path("manifests", confdir) }
+      let(:testingdir) { File.join(environmentpath, "testing") }
+
+      before(:each) do
+        FileUtils.mkdir_p(testingdir)
+      end
+
+      before(:each) do
+        FileUtils.mkdir_p(manifestsdir)
+
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=#{manifestsdir}
+  disable_per_environment_manifest=true
+          EOF
+        end
+
+        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
+        end
+      end
+
+      it "reads manifest from the default manifest setting" do
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromAbsoluteDefaultManifest]')
+        )
+      end
+
+      it "refuses to compile if environment.conf specifies a different manifest" do
+        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+          f.puts("manifest=./special_manifests")
+        end
+
+        expect { a_catalog_compiled_for_environment('testing') }.to(
+          raise_error(Puppet::Error, /disable_per_environment_manifest.*environment.conf.*manifest.*conflict/)
+        )
+      end
+
+      it "reads manifest from default_manifest setting when environment.conf has manifest set if setting equals default_manifest setting" do
+        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+          f.puts("manifest=#{manifestsdir}")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromAbsoluteDefaultManifest]')
+        )
+      end
+
+      it "logs errors if environment.conf specifies a different manifest" do
+        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+          f.puts("manifest=./special_manifests")
+        end
+
+        Puppet.initialize_settings
+        expect(Puppet[:environmentpath]).to eq(environmentpath)
+        environment = Puppet.lookup(:environments).get('testing')
+        expect(environment.manifest).to eq(manifestsdir)
+        expect(@logs.first.to_s).to match(%r{disable_per_environment_manifest.*is true, but.*environment.*at #{testingdir}.*has.*environment.conf.*manifest.*#{testingdir}/special_manifests})
+      end
+
+      it "raises an error if default_manifest is not absolute" do
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  environmentpath=#{environmentpath}
+  default_manifest=./relative
+  disable_per_environment_manifest=true
+          EOF
+        end
+
+        expect { Puppet.initialize_settings }.to raise_error(Puppet::Settings::ValidationError, /default_manifest.*must be.*absolute.*when.*disable_per_environment_manifest.*true/)
+      end
+    end
+
+    context "in legacy environments" do
+      let(:environmentpath) { '' }
+      let(:manifestsdir) { File.expand_path("default_manifests", confdir) }
+      let(:legacy_manifestsdir) { File.expand_path('manifests', confdir) }
+
+      before(:each) do
+        FileUtils.mkdir_p(manifestsdir)
+
+        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+          f.puts(<<-EOF)
+  default_manifest=#{manifestsdir}
+  disable_per_environment_manifest=true
+  manifest=#{legacy_manifestsdir}
+          EOF
+        end
+
+        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
+        end
+      end
+
+      it "has no effect on compilation" do
+        FileUtils.mkdir_p(legacy_manifestsdir)
+
+        File.open(File.join(legacy_manifestsdir, "site.pp"), "w") do |f|
+          f.puts("notify { 'ManifestFromLegacy': }")
+        end
+
+        expect(a_catalog_compiled_for_environment('testing')).to(
+          include_resource('Notify[ManifestFromLegacy]')
+        )
+      end
+    end
+  end
+
+  describe 'using future parser' do
+    before :each do
+      Puppet[:parser] = 'future'
+    end
+    it_behaves_like 'puppet with default_manifest settings'
+  end
+
+  describe 'using current parser' do
+    before :each do
+      Puppet[:parser] = 'current'
+    end
+    it_behaves_like 'puppet with default_manifest settings'
+  end
+
+  RSpec::Matchers.define :include_resource do |expected|
+    match do |actual|
+      actual.resources.map(&:ref).include?(expected)
+    end
+
+    def failure_message_for_should
+      "expected #{@actual.resources.map(&:ref)} to include #{expected}"
+    end
+
+    def failure_message_for_should_not
+      "expected #{@actual.resources.map(&:ref)} not to include #{expected}"
+    end
+  end
+
+  def a_catalog_compiled_for_environment(envname)
+    Puppet.initialize_settings
+    expect(Puppet[:environmentpath]).to eq(environmentpath)
+    node = Puppet::Node.new('testnode', :environment => 'testing')
+    expect(node.environment).to eq(Puppet.lookup(:environments).get('testing'))
+    Puppet::Parser::Compiler.compile(node)
+  end
+end
+end