puppet 4.2.0 → 4.3.0

data/spec/integration/parser/compiler_spec.rb

@@ -49,6 +49,10 @@ class CompilerTestResource
   def line
     "42"
   end
+
+  def resource_type
+    self.class
+  end
 end
 
 describe Puppet::Parser::Compiler do
@@ -655,7 +659,7 @@ describe Puppet::Parser::Compiler do
       @node.classes = klass
       klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {'a' => nil, 'b' => nil})
       @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, "Must pass b to Class[Foo]")
+      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: expects a value for parameter 'b'/)
     end
 
     it "should fail if invalid parameters are passed" do
@@ -663,7 +667,7 @@ describe Puppet::Parser::Compiler do
       @node.classes = klass
       klass = Puppet::Resource::Type.new(:hostclass, 'foo', :arguments => {})
       @compiler.topscope.known_resource_types.add klass
-      expect { @compiler.compile }.to raise_error(Puppet::ParseError, "Invalid parameter: '3' on Class[Foo]")
+      expect { @compiler.compile }.to raise_error(Puppet::PreformattedError, /Class\[Foo\]: has no parameter named '3'/)
     end
 
     it "should ensure class is in catalog without params" do
@@ -1202,13 +1206,15 @@ describe Puppet::Parser::Compiler do
 
     it 'should recompute the version after input files are re-parsed' do
       Puppet[:code] = 'class foo { }'
-      Time.stubs(:now).returns(1)
+      first_time = Time.at(1)
+      second_time = Time.at(200)
+      Time.stubs(:now).returns(first_time)
       node = Puppet::Node.new('mynode')
-      expect(Puppet::Parser::Compiler.compile(node).version).to eq(1)
-      Time.stubs(:now).returns(2)
-      expect(Puppet::Parser::Compiler.compile(node).version).to eq(1) # no change because files didn't change
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(first_time.to_i)
+      Time.stubs(:now).returns(second_time)
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(first_time.to_i) # no change because files didn't change
       Puppet[:code] = nil
-      expect(Puppet::Parser::Compiler.compile(node).version).to eq(2)
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(second_time.to_i)
     end
 
     ['define', 'class', 'node'].each do |thing|
@@ -1450,7 +1456,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x) { }
             foo { 'test': x =>'say friend' }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef for a non-optional type' do
@@ -1459,7 +1465,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x) { }
             foo { 'test': x => undef }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'denies non type compliant default argument' do
@@ -1468,7 +1474,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x = 'pow') { }
             foo { 'test':  }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef as the default for a non-optional type' do
@@ -1477,7 +1483,7 @@ describe Puppet::Parser::Compiler do
             define foo(Integer $x = undef) { }
             foo { 'test':  }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Foo\[test\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'accepts a Resource as a Type' do
@@ -1498,7 +1504,7 @@ describe Puppet::Parser::Compiler do
             define foo(Struct[{b => Integer, d=>String}] $a) { }
             foo{ bar: a => {b => 5, c => 'stuff'}}
           MANIFEST
-        end.to raise_error(/got Struct\[\{'b'=>Integer, 'c'=>String\}\]/)
+        end.to raise_error(/Foo\[bar\]:\s+parameter 'a' expects a value for key 'd'\s+parameter 'a' has no 'c' key/m)
       end
     end
 
@@ -1536,7 +1542,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x) { }
             class { 'foo': x =>'say friend' }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef for a non-optional type' do
@@ -1545,7 +1551,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x) { }
             class { 'foo': x => undef }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'denies non type compliant default argument' do
@@ -1554,7 +1560,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x = 'pow') { }
             class { 'foo':  }
           MANIFEST
-        end.to raise_error(/type Integer, got String/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got String/)
       end
 
       it 'denies undef as the default for a non-optional type' do
@@ -1563,7 +1569,7 @@ describe Puppet::Parser::Compiler do
             class foo(Integer $x = undef) { }
             class { 'foo':  }
           MANIFEST
-        end.to raise_error(/type Integer, got Undef/)
+        end.to raise_error(/Class\[Foo\]: parameter 'x' expects an Integer value, got Undef/)
       end
 
       it 'accepts a Resource as a Type' do
@@ -1630,7 +1636,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1) |String $x| { }
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'x' expects a String value, got Integer/m)
       end
 
       it 'denies non-type-compliant, slurped arguments' do
@@ -1638,7 +1644,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1, "hello") |Integer *$x| { }
           MANIFEST
-        end.to raise_error(/called with mis-matched arguments.*expected.*Integer.*actual.*Integer, String/m)
+        end.to raise_error(/block parameter 'x' expects an Integer value, got String/m)
       end
 
       it 'denies non-type-compliant default argument' do
@@ -1646,7 +1652,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(1) |$x, String $defaulted = 1| { notify { "${$x + $defaulted}": }}
           MANIFEST
-        end.to raise_error(/expected.*Any.*String.*actual.*Integer.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'raises an error when a default argument value is an incorrect type and there are no arguments passed' do
@@ -1654,7 +1660,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |String $defaulted = 1| {}
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'raises an error when the default argument for a slurped parameter is an incorrect type' do
@@ -1662,7 +1668,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |String *$defaulted = 1| {}
           MANIFEST
-        end.to raise_error(/expected.*String.*actual.*Integer/m)
+        end.to raise_error(/block parameter 'defaulted' expects a String value, got Integer/m)
       end
 
       it 'allows using an array as the default slurped value' do
@@ -1694,7 +1700,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with() |Array[String, 2] *$defaulted = hi| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+        end.to raise_error(/block expects at least 2 arguments, got 1/m)
       end
 
       it 'raises an error when the number of passed values does not match the parameter\'s size specification' do
@@ -1702,7 +1708,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(hi) |Array[String, 2] *$passed| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+        end.to raise_error(/block expects at least 2 arguments, got 1/m)
       end
 
       it 'matches when the number of arguments passed for a slurp parameter match the size specification' do
@@ -1721,7 +1727,7 @@ describe Puppet::Parser::Compiler do
           compile_to_catalog(<<-MANIFEST)
             with(hi, bye) |Array[String, 1, 1] *$passed| { }
           MANIFEST
-        end.to raise_error(/expected.*arg count \{1\}.*actual.*arg count \{2\}/m)
+        end.to raise_error(/block expects 1 argument, got 2/m)
       end
 
       it 'allows passing slurped arrays by specifying an array of arrays' do

data/spec/integration/parser/resource_expressions_spec.rb

@@ -167,15 +167,15 @@ describe "Puppet resource expressions" do
     produces("notify{title:}; Notify[title] { * => { message => set}}" => "Notify[title][message] == 'set'")
     produces("Notify { * => { message => set}}; notify{title:}"      => "Notify[title][message] == 'set'")
 
-    fails("notify { title: unknown => value }" => /Invalid parameter: 'unknown'/)
+    fails("notify { title: unknown => value }" => /no parameter named 'unknown'/)
 
     # this really needs to be a better error message.
-    fails("notify { title: * => { hash => value }, message => oops }" => /Invalid parameter: 'hash'/)
+    fails("notify { title: * => { hash => value }, message => oops }" => /no parameter named 'hash'/)
 
     # should this be a better error message?
-    fails("notify { title: message => oops, * => { hash => value } }" => /Invalid parameter: 'hash'/)
+    fails("notify { title: message => oops, * => { hash => value } }" => /no parameter named 'hash'/)
 
-    fails("notify { title: * => { unknown => value } }" => /Invalid parameter: 'unknown'/)
+    fails("notify { title: * => { unknown => value } }" => /no parameter named 'unknown'/)
     fails("
          $x = { mode => '0666' }
          $y = { owner => the_y }

data/spec/integration/parser/undef_param_spec.rb

@@ -78,7 +78,7 @@ describe "Parameter passing" do
   end
 
   it "errors when no parameter is provided and there is no default" do
-    expect_puppet_error(/^Must pass x to A\[a\].*/) do <<-MANIFEST
+    expect_puppet_error(/A\[a\]: expects a value for parameter 'x'/) do <<-MANIFEST
         define a($x) { notify { 'something': message => $x }}
         a {'a': }
     MANIFEST

data/spec/integration/provider/package_spec.rb

@@ -12,7 +12,9 @@ describe "Package provider" do
         options = {:name => "nosuch#{provider.name}", :provider => provider.name}
 
         pkg = Puppet::Type.newpackage(options)
-        expect { pkg.provider.install }.to raise_error
+        expect { pkg.provider.install }.to raise_error { |error|
+          expect(error).not_to eq("")
+        }
       end
 
       it "should be able to get a list of existing packages" do

data/spec/integration/resource/catalog_spec.rb

@@ -35,7 +35,7 @@ describe Puppet::Resource::Catalog do
       node.stub_everything
 
       Puppet::Node.indirection.expects(:find).returns(node)
-      compiler.expects(:compile).with(node).returns nil
+      compiler.expects(:compile).with(node, anything).returns nil
 
       expect(Puppet::Resource::Catalog.indirection.find("me")).to be_nil
     end

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -13,7 +13,6 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
 
     Puppet.settings[:confdir] = dir
     Puppet.settings[:vardir] = dir
-    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
 

data/spec/integration/ssl/certificate_request_spec.rb

@@ -12,7 +12,6 @@ describe Puppet::SSL::CertificateRequest do
 
     Puppet.settings[:confdir] = dir
     Puppet.settings[:vardir] = dir
-    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :none
 

data/spec/integration/ssl/certificate_revocation_list_spec.rb

@@ -12,7 +12,6 @@ describe Puppet::SSL::CertificateRevocationList do
 
     Puppet.settings[:confdir] = dir
     Puppet.settings[:vardir] = dir
-    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
   end

data/spec/integration/ssl/host_spec.rb

@@ -12,7 +12,6 @@ describe Puppet::SSL::Host do
 
     Puppet.settings[:confdir] = dir
     Puppet.settings[:vardir] = dir
-    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
 

data/spec/integration/type/package_spec.rb

@@ -54,6 +54,7 @@ end
 
 describe Puppet::Type.type(:package), "when packages with the same name are sourced" do
   before :each do
+    Process.stubs(:euid).returns 0
     @provider = stub(
       'provider',
       :class           => Puppet::Type.type(:package).defaultprovider,
@@ -131,6 +132,7 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
   let(:provider) { stub('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
 
   before :each do
+    Process.stubs(:euid).returns 0
     provider.stubs(:satisfies?).with([:purgeable]).returns(true)
     provider.class.stubs(:instances).returns([])
     provider.stubs(:install).returns nil

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/util/rdoc'
 
-describe "RDoc::Parser" do
+describe "RDoc::Parser", :unless => Puppet.features.microsoft_windows? do
   require 'puppet_spec/files'
   include PuppetSpec::Files
 

data/spec/integration/util/windows/security_spec.rb

@@ -238,6 +238,24 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
               expect(ace.mask).to eq(klass::FILE_ALL_ACCESS)
               expect(ace).not_to be_inherited
             end
+
+            if Puppet::FileSystem.directory?(path)
+              system_aces.each do |ace|
+                expect(ace).to be_object_inherit
+                expect(ace).to be_container_inherit
+              end
+
+              # it's critically important that this file be default created
+              # and that this file not have it's owner / group / mode set by winsec
+              nested_file = File.join(path, 'nested_file')
+              File.new(nested_file, 'w').close
+
+              system_aces = winsec.get_aces_for_path_by_sid(nested_file, sids[:system])
+              # even when SYSTEM is the owner (in CI), there should be an inherited SYSTEM
+              expect(system_aces.any? do |ace|
+                ace.mask == klass::FILE_ALL_ACCESS && ace.inherited?
+              end).to be_truthy
+            end
           end
 
           describe "for modes that require deny aces" do

data/spec/lib/matchers/include_in_order.rb

@@ -11,10 +11,10 @@ RSpec::Matchers.define :include_in_order do |*expected|
   end
 
   def failure_message
-    "expected #{@actual.inspect} to include#{expected_to_sentence} in order"
+    "expected #{@actual.inspect} to include#{expected} in order"
   end
 
   def failure_message_when_negated
-    "expected #{@actual.inspect} not to include#{expected_to_sentence} in order"
+    "expected #{@actual.inspect} not to include#{expected} in order"
   end
 end

data/spec/shared_behaviours/iterative_functions.rb

@@ -22,25 +22,25 @@ shared_examples_for 'all iterative functions argument checks' do |func|
   it 'raises an error when called with any parameters besides a block' do
     expect do
       compile_to_catalog(<<-MANIFEST)
-        [1].#{func}(1) |$v| {  }
+        [1].#{func}(1,2) |$v,$y| {  }
       MANIFEST
-    end.to raise_error(Puppet::Error, /mis-matched arguments.*expected.*arg count \{2\}.*actual.*arg count \{3\}/m)
+    end.to raise_error(Puppet::Error, /expects (?:between 1 and 2 arguments|1 argument), got 3/)
   end
 
   it 'raises an error when called without a block' do
     expect do
       compile_to_catalog(<<-MANIFEST)
-        [1].#{func}()
+        [1].#{func}
       MANIFEST
-    end.to raise_error(Puppet::Error, /mis-matched arguments.*expected.*arg count \{2\}.*actual.*arg count \{1\}/m)
+    end.to raise_error(Puppet::Error, /expects a block/)
   end
 
   it 'raises an error when called with something that is not a block' do
     expect do
       compile_to_catalog(<<-MANIFEST)
-        [1].#{func}(1)
+        [1].#{func}(1,2)
       MANIFEST
-    end.to raise_error(Puppet::Error, /mis-matched arguments.*expected.*Callable.*actual(?!Callable\)).*/m)
+    end.to raise_error(Puppet::Error, /expects (?:between 1 and 2 arguments|1 argument), got 3/)
   end
 
   it 'raises an error when called with a block with too many required parameters' do
@@ -48,7 +48,7 @@ shared_examples_for 'all iterative functions argument checks' do |func|
       compile_to_catalog(<<-MANIFEST)
         [1].#{func}() |$v1, $v2, $v3| {  }
       MANIFEST
-    end.to raise_error(Puppet::Error, /mis-matched arguments.*expected.*arg count \{2\}.*actual.*Callable\[Any, Any, Any\]/m)
+    end.to raise_error(Puppet::Error, /block expects(?: between 1 and)? 2 arguments, got 3/)
   end
 
   it 'raises an error when called with a block with too few parameters' do
@@ -56,7 +56,7 @@ shared_examples_for 'all iterative functions argument checks' do |func|
       compile_to_catalog(<<-MANIFEST)
         [1].#{func}() | | {  }
       MANIFEST
-    end.to raise_error(Puppet::Error, /mis-matched arguments.*expected.*arg count \{2\}.*actual.*Callable\[0, 0\]/m)
+    end.to raise_error(Puppet::Error, /block expects(?: between 1 and)? 2 arguments, got none/)
   end
 
   it 'does not raise an error when called with a block with too many but optional arguments' do

data/spec/spec_helper.rb

@@ -43,6 +43,13 @@ Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
   require behaviour.relative_path_from(Pathname.new(dir))
 end
 
+require 'vcr'
+VCR.configure do |vcr|
+  vcr.cassette_library_dir = File.expand_path('vcr/cassettes', PuppetSpec::FIXTURE_DIR)
+  vcr.hook_into :webmock
+  vcr.configure_rspec_metadata!
+end
+
 RSpec.configure do |config|
   include PuppetSpec::Fixtures
 

data/spec/unit/agent/locker_spec.rb

@@ -58,17 +58,17 @@ describe Puppet::Agent::Locker do
     expect(@locker.lock { :result }).to eq(:result)
   end
 
-  it "should return nil when the lock method does not receive the lock" do
+  it "should raise LockError when the lock method does not receive the lock" do
     @locker.send(:lockfile).expects(:lock).returns false
 
-    expect(@locker.lock {}).to be_nil
+    expect { @locker.lock {} }.to raise_error(Puppet::LockError)
   end
 
   it "should not yield when the lock method does not receive the lock" do
     @locker.send(:lockfile).expects(:lock).returns false
 
     yielded = false
-    @locker.lock { yielded = true }
+    expect { @locker.lock { yielded = true } }.to raise_error(Puppet::LockError)
     expect(yielded).to be_falsey
   end
 
@@ -76,7 +76,7 @@ describe Puppet::Agent::Locker do
     @locker.send(:lockfile).expects(:lock).returns false
     @locker.send(:lockfile).expects(:unlock).never
 
-    @locker.lock {}
+    expect { @locker.lock {} }.to raise_error(Puppet::LockError)
   end
 
   it "should unlock after yielding upon obtaining a lock" do

data/spec/unit/agent_spec.rb

@@ -58,7 +58,6 @@ describe Puppet::Agent do
 
     client.expects(:run)
 
-    @agent.stubs(:running?).returns false
     @agent.stubs(:disabled?).returns false
     @agent.run
   end
@@ -75,7 +74,6 @@ describe Puppet::Agent do
   describe "when being run" do
     before do
       AgentTestClient.stubs(:lockfile_path).returns "/my/lock"
-      @agent.stubs(:running?).returns false
       @agent.stubs(:disabled?).returns false
     end
 
@@ -85,12 +83,6 @@ describe Puppet::Agent do
       @agent.run
     end
 
-    it "should do nothing if already running" do
-      @agent.expects(:running?).returns true
-      AgentTestClient.expects(:new).never
-      @agent.run
-    end
-
     it "should do nothing if disabled" do
       @agent.expects(:disabled?).returns(true)
       AgentTestClient.expects(:new).never

data/spec/unit/application/agent_spec.rb

@@ -197,6 +197,11 @@ describe Puppet::Application::Agent do
       Puppet.stubs(:settraps)
     end
 
+    it "should not run with extra arguments" do
+      @puppetd.command_line.stubs(:args).returns(%w{disable})
+      expect{@puppetd.setup}.to raise_error ArgumentError, /does not take parameters/
+    end
+
     describe "with --test" do
       it "should call setup_test" do
         @puppetd.options[:test] = true

data/spec/unit/application/apply_spec.rb

@@ -359,7 +359,7 @@ describe Puppet::Application::Apply do
         it "should raise an error if we can't find the facts" do
           Puppet::Node::Facts.indirection.expects(:find).returns(nil)
 
-          expect { @apply.main }.to raise_error
+          expect { @apply.main }.to raise_error(RuntimeError, /Could not find facts/)
         end
       end
 
@@ -470,4 +470,12 @@ describe Puppet::Application::Apply do
       @apply.send(:apply_catalog, catalog)
     end
   end
+
+  it "should honor the catalog_cache_terminus setting" do
+    Puppet.settings[:catalog_cache_terminus] = "json"
+    Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:json)
+
+    @apply.initialize_app_defaults
+    @apply.setup
+  end
 end

data/spec/unit/application/filebucket_spec.rb

@@ -21,7 +21,15 @@ describe Puppet::Application::Filebucket do
     expect(@filebucket).to respond_to(:restore)
   end
 
-  [:bucket, :debug, :local, :remote, :verbose].each do |option|
+  it "should declare a diff command" do
+    expect(@filebucket).to respond_to(:diff)
+  end
+
+  it "should declare a list command" do
+    expect(@filebucket).to respond_to(:list)
+  end
+
+  [:bucket, :debug, :local, :remote, :verbose, :fromdate, :todate].each do |option|
     it "should declare handle_#{option} method" do
       expect(@filebucket).to respond_to("handle_#{option}".to_sym)
     end
@@ -173,7 +181,7 @@ describe Puppet::Application::Filebucket do
     describe "the command backup" do
       it "should fail if no arguments are specified" do
         @filebucket.stubs(:args).returns([])
-        expect { @filebucket.backup }.to raise_error
+        expect { @filebucket.backup }.to raise_error(RuntimeError, /You must specify a file to back up/)
       end
 
       it "should call the client backup method for each given parameter" do
@@ -201,6 +209,84 @@ describe Puppet::Application::Filebucket do
       end
     end
 
+    describe "the command diff" do
+      it "should call the client diff method with 2 given checksums" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).returns(false)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(md5a,md5b, nil, nil)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with a path if the second argument is a file" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(false)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(true)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(md5a, nil, nil, md5b)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with a path if the first argument is a file" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(false)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(nil, md5b, md5a, nil)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with paths if the both arguments are files" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(true)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(nil, nil, md5a, md5b)
+
+        @filebucket.diff
+      end
+
+      it "should fail if only one checksum is given" do
+        md5a="DEADBEEF"
+        @filebucket.stubs(:args).returns([md5a])
+
+        expect { @filebucket.diff }.to raise_error Puppet::Error
+      end
+    end
+    describe "the command list" do
+      it "should call the client list method with nil dates" do
+        @client.expects(:list).with(nil, nil)
+
+        @filebucket.list
+      end
+      it "should call the client list method with the given dates" do
+        # 3 Hours ago
+        threehours = 60*60*3
+        fromdate = (Time.now - threehours).strftime("%F %T")
+        # 1 Hour ago
+        onehour = 60*60
+        todate = (Time.now - onehour).strftime("%F %T")
+
+        @filebucket.options.stubs(:[]).with(:fromdate).returns(fromdate)
+        @filebucket.options.stubs(:[]).with(:todate).returns(todate)
+
+        @client.expects(:list).with(fromdate, todate)
+
+        @filebucket.list
+      end
+    end
+
   end