puppet 2.7.11 → 2.7.12

data/spec/unit/module_tool/application_spec.rb

@@ -4,9 +4,9 @@ require 'puppet/module_tool'
 describe Puppet::Module::Tool::Applications::Application do
   describe 'app' do
 
-    good_versions = %w{ 1.2.4 0.0.1 0.0.0 0.0.2git-8-g3d316d1 0.0.3b1 10.100.10000
-                         0.1.2rc1 0.1.2dev-1 0.1.2svn12345 }
-    bad_versions = %w{ 0.1.2-3 0.1 0 0.1.2.3 dev }
+    good_versions = %w{ 1.2.4 0.0.1 0.0.0 0.0.2-git-8-g3d316d1 0.0.3-b1 10.100.10000
+                         0.1.2-rc1 0.1.2-dev-1 0.1.2-svn12345 0.1.2-3 }
+    bad_versions = %w{ 0.1 0 0.1.2.3 dev 0.1.2beta }
 
     before do
       @app = Class.new(described_class).new

data/spec/unit/module_tool/uninstaller_spec.rb

@@ -5,40 +5,120 @@ require 'tmpdir'
 describe Puppet::Module::Tool::Applications::Uninstaller do
   include PuppetSpec::Files
 
-  describe "instances" do
-    let(:tmp_module_path1) { tmpdir("uninstaller_module_path1") }
-    let(:tmp_module_path2) { tmpdir("uninstaller_module_path2") }
-    let(:options) do
-      { :target_directories => [ tmp_module_path1, tmp_module_path2 ] }
-    end
+  def mkmod(name, path, metadata=nil)
+    modpath = File.join(path, name)
+    FileUtils.mkdir_p(modpath)
 
-    it "should return an empty list if the module is not installed" do
-      described_class.new('foo', options).run.should == []
+    # For some tests we need the metadata to be present, mainly
+    # when testing against specific versions of a module.
+    if metadata
+      File.open(File.join(modpath, 'metadata.json'), 'w') do |f|
+        f.write(metadata.to_pson)
+      end
     end
 
-    it "should uninstall an installed module" do
-      foo_module_path = File.join(tmp_module_path1, 'foo')
-      Dir.mkdir(foo_module_path)
-      described_class.new('foo', options).run.should == [ foo_module_path ]
-    end
+    modpath
+  end
 
-    it "should only uninstall the requested module" do
-      foo_module_path = File.join(tmp_module_path1, 'foo')
-      bar_module_path = File.join(tmp_module_path1, 'bar')
-      Dir.mkdir(foo_module_path)
-      Dir.mkdir(bar_module_path)
-      described_class.new('foo', options).run.should == [ foo_module_path ]
+  describe "the behavior of the instances" do
+
+    before do
+      @uninstaller = Puppet::Module::Tool::Applications::Uninstaller
+      FileUtils.mkdir_p(modpath1)
+      FileUtils.mkdir_p(modpath2)
+      fake_env.modulepath = [modpath1, modpath2]
     end
 
-    it "should uninstall the module from all target directories" do
-      foo1_module_path = File.join(tmp_module_path1, 'foo')
-      foo2_module_path = File.join(tmp_module_path2, 'foo')
-      Dir.mkdir(foo1_module_path)
-      Dir.mkdir(foo2_module_path)
-      described_class.new('foo', options).run.should == [ foo1_module_path, foo2_module_path ]
+    let(:modpath1) { File.join(tmpdir("uninstaller"), "modpath1") }
+    let(:modpath2) { File.join(tmpdir("uninstaller"), "modpath2") }
+    let(:fake_env) { Puppet::Node::Environment.new('fake_env') }
+    let(:options)  { {:environment => "fake_env"} }
+
+    context "when the module is not installed" do
+      it "should return an empty list" do
+        results = @uninstaller.new('fakemod_not_installed', options).run
+        results[:removed_mods].should == []
+      end
     end
 
-    #11803
-    it "should check for broken dependencies"
+    context "when the module is installed" do
+      it "should uninstall the module" do
+        foo = mkmod("foo", modpath1)
+
+        results = @uninstaller.new("foo", options).run
+        results[:removed_mods].should == [
+          Puppet::Module.new('foo', :environment => fake_env, :path => foo)
+        ]
+      end
+
+      it "should only uninstall the requested module" do
+        foo = mkmod("foo", modpath1)
+
+        results = @uninstaller.new("foo", options).run
+        results[:removed_mods].should == [
+          Puppet::Module.new("foo", :environment => fake_env, :path => foo)
+        ]
+      end
+
+      it "should uninstall the module from every path in the modpath" do
+        foo1 = mkmod('foo', modpath1)
+        foo2 = mkmod('foo', modpath2)
+
+        results = @uninstaller.new('foo', options).run
+        results[:removed_mods].length.should == 2
+        results[:removed_mods].should include(
+          Puppet::Module.new('foo', :environment => fake_env, :path => foo1),
+          Puppet::Module.new('foo', :environment => fake_env, :path => foo2)
+        )
+      end
+
+      context "when options[:version] is specified" do
+        let(:metadata) do
+          {
+            "author"       => "",
+            "name"         => "foo",
+            "version"      => "1.0.0",
+            "source"       => "http://dummyurl",
+            "license"      => "Apache2",
+            "dependencies" => [],
+          }
+        end
+
+        it "should uninstall the module if the version matches" do
+          foo = mkmod('foo', modpath1, metadata)
+
+          options[:version] = "1.0.0"
+
+          results = @uninstaller.new("foo", options).run
+          results[:removed_mods].length.should == 1
+          results[:removed_mods].first.name.should == "foo"
+          results[:removed_mods].first.version.should == "1.0.0"
+        end
+
+        it "should not uninstall the module if the version does not match" do
+          foo = mkmod("foo", modpath1, metadata)
+
+          options[:version] = "2.0.0"
+
+          results = @uninstaller.new("foo", options).run
+          results[:removed_mods].should == []
+        end
+
+        context "when the module metadata is missing" do
+          it "should not uninstall the module" do
+            foo = mkmod("foo", modpath1)
+
+            options[:version] = "2.0.0"
+
+            results = @uninstaller.new("foo", options).run
+            results[:removed_mods].should == []
+          end
+        end
+      end
+
+      # This test is pending work in #11803 to which will add
+      # dependency resolution.
+      it "should check for broken dependencies"
+    end
   end
 end

data/spec/unit/module_tool_spec.rb

@@ -2,37 +2,4 @@ require 'spec_helper'
 require 'puppet/module_tool'
 
 describe Puppet::Module::Tool do
-  describe 'http_proxy support' do
-    before :each do
-      ENV["http_proxy"] = nil
-    end
-
-    after :each do
-      ENV["http_proxy"] = nil
-    end
-
-    it "should support environment variable for port and host" do
-      ENV["http_proxy"] = "http://test.com:8011"
-      described_class.http_proxy_host.should == "test.com"
-      described_class.http_proxy_port.should == 8011
-    end
-
-    it "should support puppet configuration for port and host" do
-      ENV["http_proxy"] = nil
-      Puppet.settings.stubs(:[]).with(:http_proxy_host).returns('test.com')
-      Puppet.settings.stubs(:[]).with(:http_proxy_port).returns(7456)
-
-      described_class.http_proxy_port.should == 7456
-      described_class.http_proxy_host.should == "test.com"
-    end
-
-    it "should use environment variable before puppet settings" do
-      ENV["http_proxy"] = "http://test1.com:8011"
-      Puppet.settings.stubs(:[]).with(:http_proxy_host).returns('test2.com')
-      Puppet.settings.stubs(:[]).with(:http_proxy_port).returns(7456)
-
-      described_class.http_proxy_host.should == "test1.com"
-      described_class.http_proxy_port.should == 8011
-    end
-  end
 end

data/spec/unit/network/authconfig_spec.rb

@@ -97,13 +97,14 @@ describe Puppet::Network::AuthConfig do
   describe "when parsing authconfig file" do
     before :each do
       @fd = stub 'fd'
+      @fd.expects(:each).never
       File.stubs(:open).yields(@fd)
       @rights.stubs(:include?).returns(false)
       @rights.stubs(:[])
     end
 
     it "should skip comments" do
-      @fd.stubs(:each).yields('  # comment')
+      @fd.stubs(:each_line).yields('  # comment')
 
       @rights.expects(:newright).never
 
@@ -111,7 +112,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should increment line number even on commented lines" do
-      @fd.stubs(:each).multiple_yields('  # comment','[puppetca]')
+      @fd.stubs(:each_line).multiple_yields('  # comment','[puppetca]')
 
       @rights.expects(:newright).with('[puppetca]', 2, 'dummy')
 
@@ -119,7 +120,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should skip blank lines" do
-      @fd.stubs(:each).yields('  ')
+      @fd.stubs(:each_line).yields('  ')
 
       @rights.expects(:newright).never
 
@@ -127,7 +128,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should increment line number even on blank lines" do
-      @fd.stubs(:each).multiple_yields('  ','[puppetca]')
+      @fd.stubs(:each_line).multiple_yields('  ','[puppetca]')
 
       @rights.expects(:newright).with('[puppetca]', 2, 'dummy')
 
@@ -135,7 +136,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should throw an error if the current namespace right already exist" do
-      @fd.stubs(:each).yields('[puppetca]')
+      @fd.stubs(:each_line).yields('[puppetca]')
 
       @rights.stubs(:include?).with("puppetca").returns(true)
 
@@ -143,7 +144,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should not throw an error if the current path right already exist" do
-      @fd.stubs(:each).yields('path /hello')
+      @fd.stubs(:each_line).yields('path /hello')
 
       @rights.stubs(:newright).with("/hello",1, 'dummy')
       @rights.stubs(:include?).with("/hello").returns(true)
@@ -152,7 +153,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should create a new right for found namespaces" do
-      @fd.stubs(:each).yields('[puppetca]')
+      @fd.stubs(:each_line).yields('[puppetca]')
 
       @rights.expects(:newright).with("[puppetca]", 1, 'dummy')
 
@@ -160,7 +161,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should create a new right for each found namespace line" do
-      @fd.stubs(:each).multiple_yields('[puppetca]', '[fileserver]')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', '[fileserver]')
 
       @rights.expects(:newright).with("[puppetca]", 1, 'dummy')
       @rights.expects(:newright).with("[fileserver]", 2, 'dummy')
@@ -169,7 +170,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should create a new right for each found path line" do
-      @fd.stubs(:each).multiple_yields('path /certificates')
+      @fd.stubs(:each_line).multiple_yields('path /certificates')
 
       @rights.expects(:newright).with("/certificates", 1, 'dummy')
 
@@ -177,7 +178,7 @@ describe Puppet::Network::AuthConfig do
     end
 
     it "should create a new right for each found regex line" do
-      @fd.stubs(:each).multiple_yields('path ~ .rb$')
+      @fd.stubs(:each_line).multiple_yields('path ~ .rb$')
 
       @rights.expects(:newright).with("~ .rb$", 1, 'dummy')
 
@@ -187,7 +188,7 @@ describe Puppet::Network::AuthConfig do
     it "should strip whitespace around ACE" do
       acl = stub 'acl', :info
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', ' allow 127.0.0.1 , 172.16.10.0  ')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', ' allow 127.0.0.1 , 172.16.10.0  ')
       @rights.stubs(:newright).with("[puppetca]", 1, 'dummy').returns(acl)
 
       acl.expects(:allow).with('127.0.0.1')
@@ -199,7 +200,7 @@ describe Puppet::Network::AuthConfig do
     it "should allow ACE inline comments" do
       acl = stub 'acl', :info
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', ' allow 127.0.0.1 # will it work?')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', ' allow 127.0.0.1 # will it work?')
       @rights.stubs(:newright).with("[puppetca]", 1, 'dummy').returns(acl)
 
       acl.expects(:allow).with('127.0.0.1')
@@ -210,7 +211,7 @@ describe Puppet::Network::AuthConfig do
     it "should create an allow ACE on each subsequent allow" do
       acl = stub 'acl', :info
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', 'allow 127.0.0.1')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', 'allow 127.0.0.1')
       @rights.stubs(:newright).with("[puppetca]", 1, 'dummy').returns(acl)
 
       acl.expects(:allow).with('127.0.0.1')
@@ -221,7 +222,7 @@ describe Puppet::Network::AuthConfig do
     it "should create a deny ACE on each subsequent deny" do
       acl = stub 'acl', :info
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', 'deny 127.0.0.1')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', 'deny 127.0.0.1')
       @rights.stubs(:newright).with("[puppetca]", 1, 'dummy').returns(acl)
 
       acl.expects(:deny).with('127.0.0.1')
@@ -233,7 +234,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('path /certificates', 'method search,find')
+      @fd.stubs(:each_line).multiple_yields('path /certificates', 'method search,find')
       @rights.stubs(:newright).with("/certificates", 1, 'dummy').returns(acl)
 
       acl.expects(:restrict_method).with('search')
@@ -246,7 +247,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', 'method search,find')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', 'method search,find')
       @rights.stubs(:newright).with("puppetca", 1, 'dummy').returns(acl)
 
       lambda { @authconfig.read }.should raise_error
@@ -256,7 +257,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('path /certificates', 'environment production,development')
+      @fd.stubs(:each_line).multiple_yields('path /certificates', 'environment production,development')
       @rights.stubs(:newright).with("/certificates", 1, 'dummy').returns(acl)
 
       acl.expects(:restrict_environment).with('production')
@@ -269,7 +270,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', 'environment env')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', 'environment env')
       @rights.stubs(:newright).with("puppetca", 1, 'dummy').returns(acl)
 
       lambda { @authconfig.read }.should raise_error
@@ -279,7 +280,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('path /certificates', 'auth yes')
+      @fd.stubs(:each_line).multiple_yields('path /certificates', 'auth yes')
       @rights.stubs(:newright).with("/certificates", 1, 'dummy').returns(acl)
 
       acl.expects(:restrict_authenticated).with('yes')
@@ -291,7 +292,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('path /certificates', 'authenticated yes')
+      @fd.stubs(:each_line).multiple_yields('path /certificates', 'authenticated yes')
       @rights.stubs(:newright).with("/certificates", 1, 'dummy').returns(acl)
 
       acl.expects(:restrict_authenticated).with('yes')
@@ -303,7 +304,7 @@ describe Puppet::Network::AuthConfig do
       acl = stub 'acl', :info
       acl.stubs(:acl_type).returns(:regex)
 
-      @fd.stubs(:each).multiple_yields('[puppetca]', 'auth yes')
+      @fd.stubs(:each_line).multiple_yields('[puppetca]', 'auth yes')
       @rights.stubs(:newright).with("puppetca", 1, 'dummy').returns(acl)
 
       lambda { @authconfig.read }.should raise_error

data/spec/unit/network/http/webrick_spec.rb

@@ -4,13 +4,13 @@ require 'puppet/network/handler'
 require 'puppet/network/http'
 require 'puppet/network/http/webrick'
 
-describe Puppet::Network::HTTP::WEBrick, "after initializing", :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Network::HTTP::WEBrick, "after initializing" do
   it "should not be listening" do
     Puppet::Network::HTTP::WEBrick.new.should_not be_listening
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick, "when turning on listening", :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do
   before do
     @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
@@ -139,7 +139,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning on listening", :unless =>
 end
 
 
-describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a protocol", :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a protocol" do
   it "should require a protocol" do
     lambda { Puppet::Network::HTTP::WEBrick.class_for_protocol }.should raise_error(ArgumentError)
   end
@@ -157,7 +157,7 @@ describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick, "when turning off listening", :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do
   before do
     @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
@@ -184,7 +184,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning off listening", :unless =
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Network::HTTP::WEBrick do
   before do
     @mock_webrick = stub('webrick', :[] => {})
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
@@ -196,7 +196,7 @@ describe Puppet::Network::HTTP::WEBrick, :unless => Puppet.features.microsoft_wi
     before do
       Puppet.settings.stubs(:value).returns "something"
       Puppet.settings.stubs(:use)
-      @filehandle = stub 'handle', :fcntl => nil, :sync => nil
+      @filehandle = stub 'handle', :fcntl => nil, :sync= => nil
 
       File.stubs(:open).returns @filehandle
     end
@@ -227,14 +227,18 @@ describe Puppet::Network::HTTP::WEBrick, :unless => Puppet.features.microsoft_wi
     end
 
     describe "and creating the logging filehandle" do
-      it "should set fcntl to 'Fcntl::F_SETFD, Fcntl::FD_CLOEXEC'" do
-        @filehandle.expects(:fcntl).with(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      it "should set the close-on-exec flag if supported" do
+        if defined? Fcntl::FD_CLOEXEC
+          @filehandle.expects(:fcntl).with(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        else
+          @filehandle.expects(:fcntl).never
+        end
 
         @server.setup_logger
       end
 
       it "should sync the filehandle" do
-        @filehandle.expects(:sync)
+        @filehandle.expects(:sync=).with(true)
 
         @server.setup_logger
       end