puppet 2.7.3 → 2.7.4

data/spec/shared_behaviours/path_parameters.rb

@@ -20,23 +20,26 @@
 
 shared_examples_for "all pathname parameters with arrays" do |win32|
   path_types = {
-    "unix absolute"  => "/foo/bar",
-    "unix relative"  => "foo/bar",
-    "win32 absolute" => %q{\foo\bar},
-    "win32 relative" => %q{foo\bar},
-    "drive absolute" => %q{c:\foo\bar},
-    "drive relative" => %q{c:foo\bar}
+    "unix absolute"            => %q{/foo/bar},
+    "unix relative"            => %q{foo/bar},
+    "win32 non-drive absolute" => %q{\foo\bar},
+    "win32 non-drive relative" => %q{foo\bar},
+    "win32 drive absolute"     => %q{c:\foo\bar},
+    "win32 drive relative"     => %q{c:foo\bar}
   }
 
   describe "when given an array of paths" do
     (1..path_types.length).each do |n|
       path_types.keys.combination(n) do |set|
         data = path_types.collect { |k, v| set.member?(k) ? v : nil } .compact
-        reject = true
-        only_absolute = set.find { |k| k =~ /relative/ } .nil?
-        only_unix     = set.reject { |k| k =~ /unix/ } .length == 0
 
-        if only_absolute and (only_unix or win32) then
+        has_relative = set.find { |k| k =~ /relative/ or k =~ /non-drive/ }
+        has_windows = set.find { |k| k =~ /win32/ }
+        has_unix = set.find { |k| k =~ /unix/ }
+
+        if has_relative or (has_windows and !win32) or (has_unix and win32)
+          reject = true
+        else
           reject = false
         end
 
@@ -144,10 +147,9 @@ shared_examples_for "all path parameters" do |param, options|
       it_should_behave_like "all pathname parameters with arrays", true
     end
 
-    it "should accept a fully qualified path" do
-      path = File.join('', 'foo')
-      instance = instance(path)
-      instance[@param].should == path
+    it "should reject a fully qualified unix path" do
+      path = '/foo'
+      expect { instance(path) }.to raise_error(Puppet::Error, /fully qualified/)
     end
 
     it "should give a useful error when the path is not absolute" do
@@ -157,7 +159,7 @@ shared_examples_for "all path parameters" do |param, options|
     end
 
     it "also accepts Unix style path separators" do
-      path = '/Program Files'
+      path = 'C:/Program Files'
       instance = instance(path)
       instance[@param].should == path
     end
@@ -172,9 +174,9 @@ shared_examples_for "all path parameters" do |param, options|
       end
     end
 
-    { "UNC paths"            => %q{\\foo\bar},
-      "unparsed local paths" => %q{\\?\c:\foo},
-      "unparsed UNC paths"   => %q{\\?\foo\bar}
+    { "UNC paths"            => %q{\\\\foo\bar},
+      "unparsed local paths" => %q{\\\\?\c:\foo},
+      "unparsed UNC paths"   => %q{\\\\?\foo\bar}
     }.each do |name, path|
       it "should accept #{name} as absolute" do
         instance = instance(path)

data/spec/shared_behaviours/store_configs_terminus.rb

@@ -0,0 +1,21 @@
+shared_examples_for "a StoreConfigs terminus" do
+  before :each do
+    Puppet[:storeconfigs] = true
+    Puppet[:storeconfigs_backend] = "store_configs_testing"
+  end
+
+  api = [:find, :search, :save, :destroy, :head]
+
+  api.each do |name|
+    it { should respond_to name }
+  end
+
+  it "should fail if an invalid backend is configured" do
+    Puppet[:storeconfigs_backend] = "synergy"
+    expect { subject }.to raise_error ArgumentError, /could not find terminus synergy/i
+  end
+
+  it "should wrap the declared backend" do
+    subject.target.class.name.should == :store_configs_testing
+  end
+end

data/spec/spec_helper.rb

@@ -36,6 +36,28 @@ RSpec.configure do |config|
   config.before :each do
     GC.disable
 
+    # We need to preserve the current state of all our indirection cache and
+    # terminus classes.  This is pretty important, because changes to these
+    # are global and lead to order dependencies in our testing.
+    #
+    # We go direct to the implementation because there is no safe, sane public
+    # API to manage restoration of these to their default values.  This
+    # should, once the value is proved, be moved to a standard API on the
+    # indirector.
+    #
+    # To make things worse, a number of the tests stub parts of the
+    # indirector.  These stubs have very specific expectations that what
+    # little of the public API we could use is, well, likely to explode
+    # randomly in some tests.  So, direct access.  --daniel 2011-08-30
+    $saved_indirection_state = {}
+    indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
+    indirections.each do |indirector|
+      $saved_indirection_state[indirector.name] = {
+        :@terminus_class => indirector.instance_variable_get(:@terminus_class),
+        :@cache_class    => indirector.instance_variable_get(:@cache_class)
+      }
+    end
+
     # these globals are set by Application
     $puppet_application_mode = nil
     $puppet_application_name = nil
@@ -71,6 +93,15 @@ RSpec.configure do |config|
     Puppet::Util::Log.close_all
     Puppet::Util::Log.level = @log_level
 
+    # Restore the indirector configuration.  See before hook.
+    indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
+    indirections.each do |indirector|
+      $saved_indirection_state.fetch(indirector.name, {}).each do |variable, value|
+        indirector.instance_variable_set(variable, value)
+      end
+    end
+    $saved_indirection_state = nil
+
     GC.enable
   end
 end

data/spec/unit/agent_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-11-12.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/agent'
 

data/spec/unit/application/apply_spec.rb

@@ -12,6 +12,14 @@ describe Puppet::Application::Apply do
     Puppet::Util::Log.stubs(:newdestination)
   end
 
+  after :each do
+    Puppet::Node::Facts.indirection.reset_terminus_class
+    Puppet::Node::Facts.indirection.cache_class = nil
+
+    Puppet::Node.indirection.reset_terminus_class
+    Puppet::Node.indirection.cache_class = nil
+  end
+
   [:debug,:loadclasses,:verbose,:use_nodes,:detailed_exitcodes].each do |option|
     it "should declare handle_#{option} method" do
       @apply.should respond_to("handle_#{option}".to_sym)
@@ -48,7 +56,6 @@ describe Puppet::Application::Apply do
   end
 
   describe "during setup" do
-
     before :each do
       Puppet::Log.stubs(:newdestination)
       Puppet.stubs(:parse_config)
@@ -111,7 +118,6 @@ describe Puppet::Application::Apply do
   end
 
   describe "when executing" do
-
     it "should dispatch to 'apply' if it was called with 'apply'" do
       @apply.options[:catalog] = "foo"
 

data/spec/unit/application/certificate_spec.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/application/certificate'
 
 describe Puppet::Application::Certificate do

data/spec/unit/application/device_spec.rb

@@ -7,6 +7,8 @@ require 'ostruct'
 require 'puppet/configurer'
 
 describe Puppet::Application::Device do
+  include PuppetSpec::Files
+
   before :each do
     @device = Puppet::Application[:device]
     @device.preinit
@@ -264,8 +266,8 @@ describe Puppet::Application::Device do
 
     describe "for each device" do
       before(:each) do
-        Puppet[:vardir] = "/dummy"
-        Puppet[:confdir] = "/dummy"
+        Puppet[:vardir] = make_absolute("/dummy")
+        Puppet[:confdir] = make_absolute("/dummy")
         Puppet[:certname] = "certname"
         @device_hash = {
           "device1" => OpenStruct.new(:name => "device1", :url => "url", :provider => "cisco"),
@@ -281,12 +283,12 @@ describe Puppet::Application::Device do
       end
 
       it "should set vardir to the device vardir" do
-        Puppet.settings.expects(:set_value).with(:vardir, "/dummy/devices/device1", :cli)
+        Puppet.settings.expects(:set_value).with(:vardir, make_absolute("/dummy/devices/device1"), :cli)
         @device.main
       end
 
       it "should set confdir to the device confdir" do
-        Puppet.settings.expects(:set_value).with(:confdir, "/dummy/devices/device1", :cli)
+        Puppet.settings.expects(:set_value).with(:confdir, make_absolute("/dummy/devices/device1"), :cli)
         @device.main
       end
 
@@ -319,9 +321,9 @@ describe Puppet::Application::Device do
       [:vardir, :confdir].each do |setting|
         it "should cleanup the #{setting} setting after the run" do
           configurer = states('configurer').starts_as('notrun')
-          Puppet.settings.expects(:set_value).with(setting, "/dummy/devices/device1", :cli).when(configurer.is('notrun'))
+          Puppet.settings.expects(:set_value).with(setting, make_absolute("/dummy/devices/device1"), :cli).when(configurer.is('notrun'))
           @configurer.expects(:run).twice.then(configurer.is('run'))
-          Puppet.settings.expects(:set_value).with(setting, "/dummy", :cli).when(configurer.is('run'))
+          Puppet.settings.expects(:set_value).with(setting, make_absolute("/dummy"), :cli).when(configurer.is('run'))
 
           @device.main
         end

data/spec/unit/application/inspect_spec.rb

@@ -103,6 +103,7 @@ describe Puppet::Application::Inspect do
       catalog = Puppet::Resource::Catalog.new
       file = Tempfile.new("foo")
       resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
+      file.close
       file.delete
       catalog.add_resource(resource)
       Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
@@ -147,7 +148,7 @@ describe Puppet::Application::Inspect do
           @inspect.run_command
         end
 
-        it "should not send unreadable files" do
+        it "should not send unreadable files", :unless => Puppet.features.microsoft_windows? do
           File.open(@file, 'w') { |f| f.write('stuff') }
           File.chmod(0, @file)
           Puppet::FileBucketFile::Rest.any_instance.expects(:head).never

data/spec/unit/application/master_spec.rb

@@ -5,7 +5,7 @@ require 'puppet/application/master'
 require 'puppet/daemon'
 require 'puppet/network/server'
 
-describe Puppet::Application::Master do
+describe Puppet::Application::Master, :unless => Puppet.features.microsoft_windows? do
   before :each do
     @master = Puppet::Application[:master]
     @daemon = stub_everything 'daemon'
@@ -106,7 +106,6 @@ describe Puppet::Application::Master do
   end
 
   describe "during setup" do
-
     before :each do
       Puppet::Log.stubs(:newdestination)
       Puppet.stubs(:settraps)
@@ -117,6 +116,12 @@ describe Puppet::Application::Master do
       @master.options.stubs(:[]).with(any_parameters)
     end
 
+    it "should abort stating that the master is not supported on Windows" do
+      Puppet.features.stubs(:microsoft_windows?).returns(true)
+
+      expect { @master.setup }.to raise_error(Puppet::Error, /Puppet master is not supported on Microsoft Windows/)
+    end
+
     it "should set log level to debug if --debug was passed" do
       @master.options.stubs(:[]).with(:debug).returns(true)
       @master.setup

data/spec/unit/application/queue_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'puppet/application/queue'
 require 'puppet/indirector/catalog/queue'
 
-describe Puppet::Application::Queue do
+describe Puppet::Application::Queue, :unless => Puppet.features.microsoft_windows? do
   before :each do
     @queue = Puppet::Application[:queue]
     @queue.stubs(:puts)
@@ -129,9 +129,8 @@ describe Puppet::Application::Queue do
       end
     end
 
-    it "should configure the Catalog class to use ActiveRecord" do
-      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:active_record)
-
+    it "should configure the Catalog class to use StoreConfigs" do
+      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:store_configs)
       @queue.setup
     end
 

data/spec/unit/application/resource_spec.rb

@@ -221,4 +221,30 @@ describe Puppet::Application::Resource do
 
     end
   end
+
+  describe "when handling file type" do
+    before :each do
+      Facter.stubs(:loadfacts)
+      @resource.preinit
+    end
+
+    it "should raise an exception if no file specified" do
+      @resource.command_line.stubs(:args).returns(['file'])
+
+      lambda { @resource.main }.should raise_error(RuntimeError, /Listing all file instances is not supported/)
+    end
+
+    it "should output a file resource when given a file path" do
+      path = File.expand_path('/etc')
+      res = Puppet::Type.type(:file).new(:path => path).to_resource
+      Puppet::Resource.indirection.expects(:find).returns(res)
+
+      @resource.command_line.stubs(:args).returns(['file', path])
+      @resource.expects(:puts).with do |args|
+        args.should =~ /file \{ '#{Regexp.escape(path)}'/m
+      end
+
+      @resource.main
+    end
+  end
 end

data/spec/unit/application/secret_agent_spec.rb

@@ -6,10 +6,12 @@ require 'puppet/indirector/report/rest'
 require 'tempfile'
 
 describe "Puppet::Application::Secret_agent" do
+  include PuppetSpec::Files
+
   it "should retrieve and apply a catalog and submit a report" do
     pending "REVISIT: 2.7 changes broke this, and we want the merge published"
 
-    dirname = Dir.mktmpdir("puppetdir")
+    dirname = tmpdir("puppetdir")
     Puppet[:vardir]   = dirname
     Puppet[:confdir]  = dirname
     Puppet[:certname] = "foo"

data/spec/unit/application_spec.rb

@@ -31,6 +31,10 @@ describe Puppet::Application do
     end
 
     it "should exit if it can't find a class" do
+      reg = "Unable to find application 'ThisShallNeverEverEverExist'.  "
+      reg += "no such file to load -- puppet/application/thisshallneverevereverexist"
+      @klass.expects(:puts).with(reg)
+
       expect { @klass.find("ThisShallNeverEverEverExist") }.to exit_with 1
     end
   end

data/spec/unit/configurer/downloader_spec.rb

@@ -97,14 +97,15 @@ describe Puppet::Configurer::Downloader do
 
   describe "when creating the catalog to do the downloading" do
     before do
-      @dler = Puppet::Configurer::Downloader.new("foo", "/download/path", "source")
+      @path = make_absolute("/download/path")
+      @dler = Puppet::Configurer::Downloader.new("foo", @path, "source")
     end
 
     it "should create a catalog and add the file to it" do
       catalog = @dler.catalog
       catalog.resources.size.should == 1
       catalog.resources.first.class.should == Puppet::Type::File
-      catalog.resources.first.name.should == "/download/path"
+      catalog.resources.first.name.should == @path
     end
 
     it "should specify that it is not managing a host catalog" do
@@ -121,7 +122,7 @@ describe Puppet::Configurer::Downloader do
       @dler = Puppet::Configurer::Downloader.new("foo", @dl_name, source_name)
     end
 
-    it "should not skip downloaded resources when filtering on tags" do
+    it "should not skip downloaded resources when filtering on tags", :fails_on_windows => true do
       Puppet[:tags] = 'maytag'
       @dler.evaluate
 

data/spec/unit/configurer_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-11-12.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/configurer'
 
@@ -93,6 +89,11 @@ describe Puppet::Configurer do
       Puppet::Util::Log.stubs(:close_all)
     end
 
+    after :all do
+      Puppet::Node::Facts.indirection.reset_terminus_class
+      Puppet::Resource::Catalog.indirection.reset_terminus_class
+    end
+
     it "should prepare for the run" do
       @agent.expects(:prepare)
 
@@ -573,6 +574,12 @@ describe Puppet::Configurer do
 
       @agent.convert_catalog(@oldcatalog, 10)
     end
+
+    it "should write the RAL catalog's resource file" do
+      @catalog.expects(:write_resource_file)
+
+      @agent.convert_catalog(@oldcatalog, 10)
+    end
   end
 
   describe "when preparing for a run" do

data/spec/unit/daemon_spec.rb

@@ -28,7 +28,9 @@ describe Puppet::Daemon do
   end
 
   describe "when setting signal traps" do
-    {:INT => :stop, :TERM => :stop, :HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
+    signals = {:INT => :stop, :TERM => :stop }
+    signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}) unless Puppet.features.microsoft_windows?
+    signals.each do |signal, method|
       it "should log and call #{method} when it receives #{signal}" do
         Signal.expects(:trap).with(signal).yields
 

data/spec/unit/face/ca_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/face'
 
-describe Puppet::Face[:ca, '0.1.0'] do
+describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
   before :each do

data/spec/unit/face/node_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 require 'puppet/face'
 
 describe Puppet::Face[:node, '0.0.1'] do
+  after :all do
+    Puppet::SSL::Host.ca_location = :none
+  end
+
   describe '#cleanup' do
     it "should clean everything" do
       {
@@ -141,7 +145,7 @@ describe Puppet::Face[:node, '0.0.1'] do
 
       describe "when cleaning cached node" do
         it "should destroy the cached node" do
-          Puppet::Node::Yaml.any_instance.expects(:destroy)
+          Puppet::Node.indirection.expects(:destroy).with(@host)
           subject.clean_cached_node(@host)
         end
       end

data/spec/unit/face/secret_agent_spec.rb

@@ -5,10 +5,12 @@ require 'puppet/indirector/catalog/rest'
 require 'tempfile'
 
 describe Puppet::Face[:secret_agent, '0.0.1'] do
+  include PuppetSpec::Files
+
   describe "#synchronize" do
     it "should retrieve and apply a catalog and return a report" do
       pending "This test doesn't work, but the code actually does - tested by LAK"
-      dirname = Dir.mktmpdir("puppetdir")
+      dirname = tmpdir("puppetdir")
       Puppet[:vardir] = dirname
       Puppet[:confdir] = dirname
       @catalog = Puppet::Resource::Catalog.new

data/spec/unit/file_bucket/dipper_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::FileBucket::Dipper do
   end
 
   it "should fail in an informative way when there are failures checking for the file on the server" do
-    @dipper = Puppet::FileBucket::Dipper.new(:Path => "/my/bucket")
+    @dipper = Puppet::FileBucket::Dipper.new(:Path => make_absolute("/my/bucket"))
 
     file = make_tmp_file('contents')
     Puppet::FileBucket::File.indirection.expects(:head).raises ArgumentError
@@ -25,7 +25,7 @@ describe Puppet::FileBucket::Dipper do
   end
 
   it "should fail in an informative way when there are failures backing up to the server" do
-    @dipper = Puppet::FileBucket::Dipper.new(:Path => "/my/bucket")
+    @dipper = Puppet::FileBucket::Dipper.new(:Path => make_absolute("/my/bucket"))
 
     file = make_tmp_file('contents')
     Puppet::FileBucket::File.indirection.expects(:head).returns false
@@ -34,7 +34,7 @@ describe Puppet::FileBucket::Dipper do
     lambda { @dipper.backup(file) }.should raise_error(Puppet::Error)
   end
 
-  it "should backup files to a local bucket" do
+  it "should backup files to a local bucket", :fails_on_windows => true do
     Puppet[:bucketdir] = "/non/existent/directory"
     file_bucket = tmpdir("bucket")
 
@@ -91,7 +91,7 @@ describe Puppet::FileBucket::Dipper do
     [request1, request2].each do |r|
       r.server.should == 'puppetmaster'
       r.port.should == 31337
-      r.key.should == "md5/#{checksum}#{real_path}"
+      r.key.should == "md5/#{checksum}/#{real_path}"
     end
   end
 

data/spec/unit/file_bucket/file_spec.rb

@@ -26,11 +26,17 @@ describe Puppet::FileBucket::File do
 
   it "should raise an error if changing content" do
     x = Puppet::FileBucket::File.new("first")
-    proc { x.contents = "new" }.should raise_error
+    expect { x.contents = "new" }.to raise_error(NoMethodError, /undefined method .contents=/)
   end
 
   it "should require contents to be a string" do
-    proc { Puppet::FileBucket::File.new(5) }.should raise_error(ArgumentError)
+    expect { Puppet::FileBucket::File.new(5) }.to raise_error(ArgumentError, /contents must be a String, got a Fixnum$/)
+  end
+
+  it "should complain about options other than :bucket_path" do
+    expect {
+      Puppet::FileBucket::File.new('5', :crazy_option => 'should not be passed')
+    }.to raise_error(ArgumentError, /Unknown option\(s\): crazy_option/)
   end
 
   it "should set the contents appropriately" do
@@ -61,7 +67,7 @@ describe Puppet::FileBucket::File do
 
   it "should reject a url-ish name with an invalid checksum" do
     bucket = Puppet::FileBucket::File.new(@contents)
-    lambda { bucket.name = "sha1/4a8ec4fa5f01b4ab1a0ab8cbccb709f0/new/path" }.should raise_error
+    expect { bucket.name = "sha1/4a8ec4fa5f01b4ab1a0ab8cbccb709f0/new/path" }.to raise_error(NoMethodError, /undefined method .name=/)
   end
 
   it "should convert the contents to PSON" do