puppet 2.6.18 → 2.7.1

data/spec/unit/util/network_device/transport/telnet_spec.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env rspec
+
+require File.dirname(__FILE__) + '/../../../../spec_helper'
+
+require 'puppet/util/network_device/transport/telnet'
+
+describe Puppet::Util::NetworkDevice::Transport::Telnet do
+
+  before(:each) do
+    @transport = Puppet::Util::NetworkDevice::Transport::Telnet.new()
+  end
+
+  it "should not handle login through the transport" do
+    @transport.should_not be_handles_login
+  end
+
+  it "should connect to the given host and port" do
+    Net::Telnet.expects(:new).with { |args| args["Host"] == "localhost" && args["Port"] == 23 }.returns stub_everything
+    @transport.host = "localhost"
+    @transport.port = 23
+
+    @transport.connect
+  end
+
+  it "should connect and specify the default prompt" do
+    @transport.default_prompt = "prompt"
+    Net::Telnet.expects(:new).with { |args| args["Prompt"] == "prompt" }.returns stub_everything
+    @transport.host = "localhost"
+    @transport.port = 23
+
+    @transport.connect
+  end
+
+  describe "when connected" do
+    before(:each) do
+      @telnet = stub_everything 'telnet'
+      Net::Telnet.stubs(:new).returns(@telnet)
+      @transport.connect
+    end
+
+    it "should send line to the telnet session" do
+      @telnet.expects(:puts).with("line")
+      @transport.send("line")
+    end
+
+    describe "when expecting output" do
+      it "should waitfor output on the telnet session" do
+        @telnet.expects(:waitfor).with(/regex/)
+        @transport.expect(/regex/)
+      end
+
+      it "should return telnet session output" do
+        @telnet.expects(:waitfor).returns("output")
+        @transport.expect(/regex/).should == "output"
+      end
+
+      it "should yield telnet session output to the given block" do
+        @telnet.expects(:waitfor).yields("output")
+        @transport.expect(/regex/) { |out| out.should == "output" }
+      end
+    end
+  end
+
+  describe "when closing" do
+    before(:each) do
+      @telnet = stub_everything 'telnet'
+      Net::Telnet.stubs(:new).returns(@telnet)
+      @transport.connect
+    end
+
+    it "should close the telnet session" do
+      @telnet.expects(:close)
+      @transport.close
+    end
+  end
+end

data/spec/unit/util/network_device_spec.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+require 'ostruct'
+require 'puppet/util/network_device'
+
+describe Puppet::Util::NetworkDevice do
+
+  before(:each) do
+    @device = OpenStruct.new(:name => "name", :provider => "test")
+  end
+
+  after(:each) do
+    Puppet::Util::NetworkDevice.clear
+  end
+
+  class Puppet::Util::NetworkDevice::Test
+    class Device
+      def initialize(device)
+      end
+    end
+  end
+
+  describe "when initializing the remote network device singleton" do
+    it "should load the network device code" do
+      Puppet::Util::NetworkDevice.expects(:require)
+      Puppet::Util::NetworkDevice.init(@device)
+    end
+
+    it "should create a network device instance" do
+      Puppet::Util::NetworkDevice.stubs(:require)
+      Puppet::Util::NetworkDevice::Test::Device.expects(:new)
+      Puppet::Util::NetworkDevice.init(@device)
+    end
+
+    it "should raise an error if the remote device instance can't be created" do
+      Puppet::Util::NetworkDevice.stubs(:require).raises("error")
+      lambda { Puppet::Util::NetworkDevice.init(@device) }.should raise_error
+    end
+
+    it "should let caller to access the singleton device" do
+      device = stub 'device'
+      Puppet::Util::NetworkDevice.stubs(:require)
+      Puppet::Util::NetworkDevice::Test::Device.expects(:new).returns(device)
+      Puppet::Util::NetworkDevice.init(@device)
+
+      Puppet::Util::NetworkDevice.current.should == device
+    end
+  end
+end

data/spec/unit/util/package_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/package'
 

data/spec/unit/util/posix_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/posix'
 

data/spec/unit/util/pson_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/pson'
 
@@ -8,7 +7,7 @@ class PsonUtil
   include Puppet::Util::Pson
 end
 
-describe Puppet::Util::Pson do
+describe Puppet::Util::Pson, :'fails_on_ruby_1.9.2' => true do
   it "should fail if no data is provided" do
     lambda { PsonUtil.new.pson_create("type" => "foo") }.should raise_error(ArgumentError)
   end

data/spec/unit/util/queue/stomp_spec.rb

@@ -1,16 +1,15 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/util/queue'
 
-describe Puppet::Util::Queue, :if => Puppet.features.stomp? do
+describe Puppet::Util::Queue, :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do
   it 'should load :stomp client appropriately' do
     Puppet.settings.stubs(:value).returns 'faux_queue_source'
     Puppet::Util::Queue.queue_type_to_class(:stomp).name.should == 'Puppet::Util::Queue::Stomp'
   end
 end
 
-describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp? do
+describe 'Puppet::Util::Queue::Stomp', :if => Puppet.features.stomp?, :'fails_on_ruby_1.9.2' => true do
   before do
     # So we make sure we never create a real client instance.
     # Otherwise we'll try to connect, and that's bad.

data/spec/unit/util/queue_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/util/queue'
 require 'spec/mocks'
 

data/spec/unit/util/rdoc/parser_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/resource/type_collection'
 require 'puppet/util/rdoc/parser'
@@ -8,7 +7,7 @@ require 'puppet/util/rdoc/code_objects'
 require 'rdoc/options'
 require 'rdoc/rdoc'
 
-describe RDoc::Parser do
+describe RDoc::Parser, :'fails_on_ruby_1.9.2' => true do
   before :each do
     File.stubs(:stat).with("init.pp")
     @top_level = stub_everything 'toplevel', :file_relative_name => "init.pp"
@@ -20,7 +19,7 @@ describe RDoc::Parser do
       @parser.stubs(:scan_top_level)
       parser = stub 'parser'
       Puppet::Parser::Parser.stubs(:new).returns(parser)
-      parser.expects(:parse).at_least_once
+      parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new('')).at_least_once
       parser.expects(:file=).with("module/manifests/init.pp")
       parser.expects(:file=).with("/dev/null/manifests/site.pp")
 
@@ -30,6 +29,7 @@ describe RDoc::Parser do
     it "should scan the ast for Puppet files" do
       parser = stub_everything 'parser'
       Puppet::Parser::Parser.stubs(:new).returns(parser)
+      parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new('')).at_least_once
 
       @parser.expects(:scan_top_level)
 
@@ -39,6 +39,7 @@ describe RDoc::Parser do
     it "should return a PuppetTopLevel to RDoc" do
       parser = stub_everything 'parser'
       Puppet::Parser::Parser.stubs(:new).returns(parser)
+      parser.expects(:parse).returns(Puppet::Parser::AST::Hostclass.new('')).at_least_once
 
       @parser.expects(:scan_top_level)
 
@@ -60,8 +61,8 @@ describe RDoc::Parser do
 
   describe "when scanning top level entities" do
     before :each do
-      @resource_type_collection = stub_everything 'resource_type_collection'
-      @parser.ast = @resource_type_collection
+      @resource_type_collection = resource_type_collection = stub_everything('resource_type_collection')
+      @parser.instance_eval { @known_resource_types = resource_type_collection }
       @parser.stubs(:split_module).returns("module")
 
       @topcontainer = stub_everything 'topcontainer'
@@ -154,8 +155,8 @@ describe RDoc::Parser do
       @definition = stub_everything 'definition', :file => "module/manifests/init.pp", :type => :definition, :name => "mydef"
       @node = stub_everything 'node', :file => "module/manifests/init.pp", :type => :node, :name => "mynode"
 
-      @resource_type_collection = Puppet::Resource::TypeCollection.new("env")
-      @parser.ast = @resource_type_collection
+      @resource_type_collection = resource_type_collection = Puppet::Resource::TypeCollection.new("env")
+      @parser.instance_eval { @known_resource_types = resource_type_collection }
 
       @container = stub_everything 'container'
     end
@@ -450,9 +451,13 @@ describe RDoc::Parser do
       @class = stub_everything 'class'
       @stmt = Puppet::Parser::AST::Resource.new(
         :type       => "File",
-        :title      => "myfile",
-        :doc        => 'mydoc',
-        :parameters => Puppet::Parser::AST::ASTArray.new(:children => [])
+        :instances  => Puppet::Parser::AST::ASTArray.new(:children => [
+          Puppet::Parser::AST::ResourceInstance.new(
+            :title => Puppet::Parser::AST::Name.new(:value => "myfile"),
+            :parameters => Puppet::Parser::AST::ASTArray.new(:children => [])
+          )
+        ]),
+        :doc        => 'mydoc'
       )
 
       @code = stub_everything 'code'

data/spec/unit/util/rdoc_spec.rb

@@ -1,13 +1,12 @@
-#!/usr/bin/env ruby
-
-Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/rdoc'
 require 'rdoc/rdoc'
 
 describe Puppet::Util::RDoc do
 
-  describe "when generating RDoc HTML documentation" do
+  describe "when generating RDoc HTML documentation", :'fails_on_ruby_1.9.2' => true do
     before :each do
       @rdoc = stub_everything 'rdoc'
       RDoc::RDoc.stubs(:new).returns(@rdoc)
@@ -123,63 +122,25 @@ describe Puppet::Util::RDoc do
     end
 
     describe "when outputing documentation" do
-      before :each do
-        @node = stub 'node', :file => "file", :line => 1, :doc => ""
-        @class = stub 'class', :file => "file", :line => 4, :doc => ""
-        @definition = stub 'definition', :file => "file", :line => 3, :doc => ""
-        @ast = stub 'ast', :nodes => { :node => @node }, :hostclasses => { :class => @class }, :definitions => { :definition => @definition }
-      end
-
-      it "should output doc for ast nodes" do
-        @node.expects(:doc)
-
-        Puppet::Util::RDoc.output("file", @ast)
-      end
-
-      it "should output doc for ast classes" do
-        @class.expects(:doc)
-
-        Puppet::Util::RDoc.output("file", @ast)
-      end
-
-      it "should output doc for ast definitions" do
-        @definition.expects(:doc)
-
-        Puppet::Util::RDoc.output("file", @ast)
-      end
-
-      it "should output doc in order of increasing line number" do
-        byline = sequence('byline')
-        @node.expects(:doc).in_sequence(byline)
-        @definition.expects(:doc).in_sequence(byline)
-        @class.expects(:doc).in_sequence(byline)
-
-        Puppet::Util::RDoc.output("file", @ast)
-      end
-
-      it "should not output documentation of ast object of another node" do
-        klass = stub 'otherclass', :file => "otherfile", :line => 12, :doc => ""
-        @ast.stubs(:hostclasses).returns({ :otherclass => klass })
-
-        klass.expects(:doc).never
-
-        Puppet::Util::RDoc.output("file", @ast)
+      it "should output doc for ast classes, nodes and definitions in order of increasing line number" do
+        byline = sequence('documentation outputs in line order')
+        Puppet::Util::RDoc.expects(:puts).with("im a class\n").in_sequence(byline)
+        Puppet::Util::RDoc.expects(:puts).with("im a node\n").in_sequence(byline)
+        Puppet::Util::RDoc.expects(:puts).with("im a define\n").in_sequence(byline)
+        # any other output must fail
+        Puppet::Util::RDoc.manifestdoc([my_fixture('basic.pp')])
       end
 
       it "should output resource documentation if needed" do
-        Puppet.settings.stubs(:[]).with(:document_all).returns(true)
-        [@node,@definition].each do |o|
-          o.stubs(:code).returns([])
-        end
-
-        resource = stub_everything 'resource', :line => 1
-        resource.stubs(:is_a?).with(Puppet::Parser::AST::ASTArray).returns(false)
-        resource.stubs(:is_a?).with(Puppet::Parser::AST::Resource).returns(true)
-        @class.stubs(:code).returns([resource])
-
-        resource.expects(:doc)
-
-        Puppet::Util::RDoc.output("file", @ast)
+        pending "#6634 being fixed"
+        Puppet.settings[:document_all] = true
+        byline = sequence('documentation outputs in line order')
+        Puppet::Util::RDoc.expects(:puts).with("im a class\n").in_sequence(byline)
+        Puppet::Util::RDoc.expects(:puts).with("im a node\n").in_sequence(byline)
+        Puppet::Util::RDoc.expects(:puts).with("im a define\n").in_sequence(byline)
+        Puppet::Util::RDoc.expects(:puts).with("im a resource\n").in_sequence(byline)
+        # any other output must fail
+        Puppet::Util::RDoc.manifestdoc([my_fixture('basic.pp')])
       end
     end
   end

data/spec/unit/util/reference_serializer_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/util/rails/reference_serializer'
 
 class SerializeTester

data/spec/unit/util/resource_template_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/resource_template'
 

data/spec/unit/util/run_mode_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Util::RunMode do
   before do

data/spec/unit/util/selinux_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/selinux'
 include Puppet::Util::SELinux
@@ -34,7 +33,7 @@ describe Puppet::Util::SELinux do
     end
   end
 
-  describe "filesystem detection" do
+  describe "filesystem detection", :'fails_on_ruby_1.9.2' => true do
     before :each do
       fh = stub 'fh', :close => nil
       File.stubs(:open).with("/proc/mounts").returns fh
@@ -193,7 +192,7 @@ describe Puppet::Util::SELinux do
     end
   end
 
-  describe "set_selinux_context" do
+  describe "set_selinux_context", :'fails_on_ruby_1.9.2' => true do
     before :each do
       fh = stub 'fh', :close => nil
       File.stubs(:open).with("/proc/mounts").returns fh

data/spec/unit/util/settings/file_setting_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/settings'
 require 'puppet/util/settings/file_setting'
@@ -249,10 +248,6 @@ describe Puppet::Util::Settings::FileSetting do
     it "should tag the resource with 'settings'" do
       @file.to_resource.should be_tagged("settings")
     end
-
-    it "should set links to 'follow'" do
-      @file.to_resource[:links].should == :follow
-    end
   end
 end