chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/spec/unit/application/apply.rb

@@ -0,0 +1,84 @@
+#
+# Author:: Bryan W. Berry (<bryan.berry@gmail.com>)
+# Copyright:: Copyright (c) 2012 Bryan W. Berry
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe Chef::Application::Apply do
+
+  before do
+    @original_config = Chef::Config.configuration
+    @app = Chef::Application::Recipe.new
+    @app.stub!(:configure_logging).and_return(true)
+    @recipe_text = "package 'nyancat'"
+    Chef::Config[:solo] = true
+  end
+
+  after do
+    Chef::Config[:solo] = nil
+    Chef::Config.configuration.replace(@original_config)
+    Chef::Config[:solo] = false
+  end
+
+
+  describe "configuring the application" do
+    it "should set solo mode to true" do
+      @app.reconfigure
+      Chef::Config[:solo].should be_true
+    end
+  end
+  describe "read_recipe_file" do
+    before do
+      @recipe_file_name = "foo.rb"
+      @recipe_path = File.expand_path("foo.rb")
+      @recipe_file = mock("Tempfile (mock)", :read => @recipe_text)
+      @app.stub!(:open).with(@recipe_path).and_return(@recipe_file)
+      File.stub!(:exist?).with("foo.rb").and_return(true)
+      Chef::Application.stub!(:fatal!).and_return(true)
+    end
+    it "should read text properly" do
+      @app.read_recipe_file(@recipe_file_name)[0].should == @recipe_text
+    end
+    it "should return a file_handle" do
+      @app.read_recipe_file(@recipe_file_name)[1].should be_instance_of(RSpec::Mocks::Mock)
+    end
+    describe "when recipe doesn't exist" do
+      before do
+        File.stub!(:exist?).with(@recipe_file_name).and_return(false)
+      end
+      it "should raise a fatal" do
+        Chef::Application.should_receive(:fatal!)
+        @app.read_recipe_file(@recipe_file_name)
+      end
+    end
+  end
+  describe "temp_recipe_file" do
+    before do
+      @app.instance_variable_set(:@recipe_text, @recipe_text)
+      @app.temp_recipe_file      
+      @recipe_fh = @app.instance_variable_get(:@recipe_fh)
+    end
+    it "should open a tempfile" do
+      @recipe_fh.path.should match(/.*recipe-temporary-file.*/)
+    end
+    it "should write recipe text to the tempfile" do
+      @recipe_fh.read.should == @recipe_text
+    end
+    it "should save the filename for later use" do
+      @recipe_fh.path.should == @app.instance_variable_get(:@recipe_filename)
+    end
+  end
+end

data/spec/unit/application/client_spec.rb

@@ -135,14 +135,25 @@ describe Chef::Application::Client, "setup_application" do
   end
 end
 
-describe Chef::Application::Client, "run_application", :unix_only do
+describe Chef::Application::Client, "configure_chef" do
   before do
-    Chef::Config[:daemonize] = true
-    Chef::Config[:interval] = 10
+    @app = Chef::Application::Client.new
+    @app.configure_chef
+  end
 
+  it "should set the colored output to false by default on windows and true otherwise" do
+    if windows?
+      Chef::Config[:color].should be_false
+    else
+      Chef::Config[:color].should be_true
+    end
+  end
+end
+
+describe Chef::Application::Client, "run_application", :unix_only do
+  before do
     @pipe = IO.pipe
     @app = Chef::Application::Client.new
-    Chef::Daemon.stub!(:daemonize).and_return(true)
     @app.stub(:run_chef_client) do
       @pipe[1].puts 'started'
       sleep 1
@@ -152,17 +163,8 @@ describe Chef::Application::Client, "run_application", :unix_only do
 
   it "should exit gracefully when sent SIGTERM" do
     pid = fork do
-      begin
-        @app.run_application
-      rescue SystemExit # expected
-      rescue Exception => e
-        $stderr.puts e
-        $stderr.puts e.backtrace
-      ensure
-        exit!
-      end
+      @app.run_application
     end
-    IO.select([@pipe[0]], nil, nil, 10).should_not be_nil
     @pipe[0].gets.should == "started\n"
     Process.kill("TERM", pid)
     Process.wait

data/spec/unit/application/knife_spec.rb

@@ -23,6 +23,11 @@ describe Chef::Application::Knife do
 
   before(:all) do
     class NoopKnifeCommand < Chef::Knife
+      option :opt_with_default,
+        :short => "-D VALUE",
+        :long => "-optwithdefault VALUE",
+        :default => "default-value"
+
       def run
       end
     end
@@ -56,6 +61,18 @@ describe Chef::Application::Knife do
     end
   end
 
+  it "should set the colored output to false by default on windows and true otherwise" do
+    with_argv(*%w{noop knife command}) do
+      @knife.should_receive(:exit).with(0)
+      @knife.run
+    end
+    if windows?
+      Chef::Config[:color].should be_false
+    else
+      Chef::Config[:color].should be_true
+    end
+  end
+
   describe "when given a path to the client key" do
     it "expands a relative path relative to the CWD" do
       relative_path = '.chef/client.pem'

data/spec/unit/application/solo_spec.rb

@@ -136,7 +136,7 @@ describe Chef::Application::Solo do
       end
 
       it "should untar the target file to the parent of the cookbook path" do
-        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvfC #{Dir.tmpdir}/chef-solo/recipes.tgz #{Dir.tmpdir}/chef-solo"}).and_return(true)
+        Chef::Mixin::Command.should_receive(:run_command).with({:command => "tar zxvf #{Dir.tmpdir}/chef-solo/recipes.tgz -C #{Dir.tmpdir}/chef-solo"}).and_return(true)
         @app.reconfigure
       end
     end

data/spec/unit/application_spec.rb

@@ -20,12 +20,17 @@ require 'spec_helper'
 
 describe Chef::Application do
   before do
+    @original_conf = Chef::Config.configuration
     Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
     Dir.stub!(:chdir).and_return(0)
     @app.stub!(:reconfigure)
   end
 
+  after do
+    Chef::Config.configuration.replace(@original_conf)
+  end
+
   describe "reconfigure" do
     before do
       @app = Chef::Application.new
@@ -170,15 +175,17 @@ describe Chef::Application do
     end
   end
 
-  describe "configure_logging" do
+  describe "when configuring the logger" do
     before do
       @app = Chef::Application.new
       Chef::Log.stub!(:init)
-      Chef::Log.stub!(:level=)
     end
 
     it "should initialise the chef logger" do
-      Chef::Log.should_receive(:init).with(Chef::Config[:log_location]).and_return(true)
+      Chef::Log.stub!(:level=)
+      @monologger = mock("Monologger")
+      MonoLogger.should_receive(:new).with(Chef::Config[:log_location]).and_return(@monologger)
+      Chef::Log.should_receive(:init).with(@monologger)
       @app.configure_logging
     end
 
@@ -187,6 +194,55 @@ describe Chef::Application do
       @app.configure_logging
     end
 
+    context "and log_level is :auto" do
+      before do
+        Chef::Config[:log_level] = :auto
+      end
+
+      context "and STDOUT is to a tty" do
+        before do
+          STDOUT.stub!(:tty?).and_return(true)
+        end
+
+        it "configures the log level to :warn" do
+          @app.configure_logging
+          Chef::Log.level.should == :warn
+        end
+
+        context "and force_logger is configured" do
+          before do
+            Chef::Config[:force_logger] = true
+          end
+
+          it "configures the log level to info" do
+            @app.configure_logging
+            Chef::Log.level.should == :info
+          end
+        end
+      end
+
+      context "and STDOUT is not to a tty" do
+        before do
+          STDOUT.stub!(:tty?).and_return(false)
+        end
+
+        it "configures the log level to :info" do
+          @app.configure_logging
+          Chef::Log.level.should == :info
+        end
+
+        context "and force_formatter is configured" do
+          before do
+            Chef::Config[:force_formatter] = true
+          end
+          it "sets the log level to :warn" do
+            @app.configure_logging
+            Chef::Log.level.should == :warn
+          end
+        end
+      end
+
+    end
   end
 
   describe "class method: fatal!" do
@@ -236,4 +292,58 @@ describe Chef::Application do
       lambda { @app.run_application }.should raise_error(Chef::Exceptions::Application)
     end
   end
+
+  describe "configuration errors" do
+    before do
+      Process.stub!(:exit).and_return(true)
+    end
+
+    def raises_informative_fatals_on_configure_chef
+      config_file_regexp = Regexp.new @app.config[:config_file]
+      Chef::Log.should_receive(:fatal).with(config_file_regexp).and_return(true)
+      @app.configure_chef
+    end
+
+    def warns_informatively_on_configure_chef
+      config_file_regexp = Regexp.new @app.config[:config_file]
+      Chef::Log.should_receive(:warn).at_least(:once).with(config_file_regexp).and_return(true)
+      Chef::Log.should_receive(:warn).any_number_of_times.and_return(true)
+      @app.configure_chef
+    end
+
+    it "should warn for bad config file path" do
+      @app.config[:config_file] = "/tmp/non-existing-dir/file"
+      warns_informatively_on_configure_chef
+    end
+
+    it "should raise informative fatals for bad config file url" do
+      non_existing_url = "http://its-stubbed.com/foo.rb"
+      @app.config[:config_file] = non_existing_url
+      Chef::REST.any_instance.stub(:fetch).with(non_existing_url).and_raise(SocketError)
+      raises_informative_fatals_on_configure_chef
+    end
+
+    describe "when config file exists but contains errors" do
+      def create_config_file(text)
+        @config_file = Tempfile.new("rspec-chef-config")
+        @config_file.write(text)
+        @config_file.close
+        @app.config[:config_file] = @config_file.path
+      end
+
+      after(:each) do
+        @config_file.unlink
+      end
+
+      it "should raise informative fatals for missing log file dir" do
+        create_config_file('log_location "/tmp/non-existing-dir/logfile"')
+        raises_informative_fatals_on_configure_chef
+      end
+
+      it "should raise informative fatals for badly written config" do
+        create_config_file("text that should break the config parsing")
+        raises_informative_fatals_on_configure_chef
+      end
+    end
+  end
 end

data/spec/unit/checksum/storage/filesystem_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Checksum::Storage::Filesystem do
     @storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
   end
 
-  it "has the path to the file's subdirectory in the checksum repo" do
+  it "has the path the the file's subdirectory in the checksum repo" do
     @storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
   end
 

data/spec/unit/chef_fs/diff_spec.rb

@@ -0,0 +1,328 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/chef_fs/file_pattern'
+require 'chef/chef_fs/command_line'
+
+# Removes the date stamp from the diff and replaces it with ' DATE'
+# example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
+# windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
+def remove_os_differences(diff)
+  diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+  diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, 'CONTEXT_LINE_NUMBERS')
+end
+
+describe 'diff', :uses_diff => true do
+  include FileSystemSupport
+
+  context 'with two filesystems with all types of difference' do
+    let(:a) {
+      memory_fs('a', {
+        :both_dirs => {
+          :sub_both_dirs => { :subsub => nil },
+          :sub_both_files => nil,
+          :sub_both_files_different => "a\n",
+          :sub_both_dirs_empty => {},
+          :sub_dirs_empty_in_a_filled_in_b => {},
+          :sub_dirs_empty_in_b_filled_in_a => { :subsub => nil },
+          :sub_a_only_dir => { :subsub => nil },
+          :sub_a_only_file => nil,
+          :sub_dir_in_a_file_in_b => {},
+          :sub_file_in_a_dir_in_b => nil
+        },
+        :both_files => nil,
+        :both_files_different => "a\n",
+        :both_dirs_empty => {},
+        :dirs_empty_in_a_filled_in_b => {},
+        :dirs_empty_in_b_filled_in_a => { :subsub => nil },
+        :dirs_in_a_cannot_be_in_b => {},
+        :file_in_a_cannot_be_in_b => nil,
+        :a_only_dir => { :subsub => nil },
+        :a_only_file => nil,
+        :dir_in_a_file_in_b => {},
+        :file_in_a_dir_in_b => nil
+      }, /cannot_be_in_a/)
+    }
+    let(:b) {
+      memory_fs('b', {
+        :both_dirs => {
+          :sub_both_dirs => { :subsub => nil },
+          :sub_both_files => nil,
+          :sub_both_files_different => "b\n",
+          :sub_both_dirs_empty => {},
+          :sub_dirs_empty_in_a_filled_in_b => { :subsub => nil },
+          :sub_dirs_empty_in_b_filled_in_a => {},
+          :sub_b_only_dir => { :subsub => nil },
+          :sub_b_only_file => nil,
+          :sub_dir_in_a_file_in_b => nil,
+          :sub_file_in_a_dir_in_b => {}
+        },
+        :both_files => nil,
+        :both_files_different => "b\n",
+        :both_dirs_empty => {},
+        :dirs_empty_in_a_filled_in_b => { :subsub => nil },
+        :dirs_empty_in_b_filled_in_a => {},
+        :dirs_in_b_cannot_be_in_a => {},
+        :file_in_b_cannot_be_in_a => nil,
+        :b_only_dir => { :subsub => nil },
+        :b_only_file => nil,
+        :dir_in_a_file_in_b => nil,
+        :file_in_a_dir_in_b => {}
+      }, /cannot_be_in_b/)
+    }
+    it 'Chef::ChefFS::CommandLine.diff_print(/)' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, nil) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+        'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
+--- a/both_dirs/sub_both_files_different DATE
++++ b/both_dirs/sub_both_files_different DATE
+CONTEXT_LINE_NUMBERS
+-a
++b
+','diff --knife a/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub DATE
+CONTEXT_LINE_NUMBERS
++subsub
+','diff --knife a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub b/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
+deleted file
+--- a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-subsub
+','Only in a/both_dirs: sub_a_only_dir
+','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
+deleted file
+--- a/both_dirs/sub_a_only_file DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-sub_a_only_file
+','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
+','Only in b/both_dirs: sub_b_only_dir
+','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_b_only_file DATE
+CONTEXT_LINE_NUMBERS
++sub_b_only_file
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+CONTEXT_LINE_NUMBERS
+-a
++b
+','diff --knife a/dirs_empty_in_a_filled_in_b/subsub b/dirs_empty_in_a_filled_in_b/subsub
+new file
+--- /dev/null DATE
++++ b/dirs_empty_in_a_filled_in_b/subsub DATE
+CONTEXT_LINE_NUMBERS
++subsub
+','diff --knife a/dirs_empty_in_b_filled_in_a/subsub b/dirs_empty_in_b_filled_in_a/subsub
+deleted file
+--- a/dirs_empty_in_b_filled_in_a/subsub DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-subsub
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-a_only_file
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+CONTEXT_LINE_NUMBERS
++b_only_file
+' ]
+    end
+    it 'Chef::ChefFS::CommandLine.diff_print(/both_dirs)' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/both_dirs'), a, b, nil, nil) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+        'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
+--- a/both_dirs/sub_both_files_different DATE
++++ b/both_dirs/sub_both_files_different DATE
+CONTEXT_LINE_NUMBERS
+-a
++b
+','diff --knife a/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub DATE
+CONTEXT_LINE_NUMBERS
++subsub
+','diff --knife a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub b/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub
+deleted file
+--- a/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-subsub
+','Only in a/both_dirs: sub_a_only_dir
+','diff --knife a/both_dirs/sub_a_only_file b/both_dirs/sub_a_only_file
+deleted file
+--- a/both_dirs/sub_a_only_file DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-sub_a_only_file
+','File a/both_dirs/sub_dir_in_a_file_in_b is a directory while file b/both_dirs/sub_dir_in_a_file_in_b is a regular file
+','File a/both_dirs/sub_file_in_a_dir_in_b is a regular file while file b/both_dirs/sub_file_in_a_dir_in_b is a directory
+','Only in b/both_dirs: sub_b_only_dir
+','diff --knife a/both_dirs/sub_b_only_file b/both_dirs/sub_b_only_file
+new file
+--- /dev/null DATE
++++ b/both_dirs/sub_b_only_file DATE
+CONTEXT_LINE_NUMBERS
++sub_b_only_file
+' ]
+    end
+    it 'Chef::ChefFS::CommandLine.diff_print(/) with depth 1' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, 1, nil) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+'Common subdirectories: b/both_dirs
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+CONTEXT_LINE_NUMBERS
+-a
++b
+','Common subdirectories: b/both_dirs_empty
+','Common subdirectories: b/dirs_empty_in_b_filled_in_a
+','Common subdirectories: b/dirs_empty_in_a_filled_in_b
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-a_only_file
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+CONTEXT_LINE_NUMBERS
++b_only_file
+' ]
+    end
+    it 'Chef::ChefFS::CommandLine.diff_print(/*_*) with depth 0' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/*_*'), a, b, 0, nil) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+'Common subdirectories: b/both_dirs
+','diff --knife a/both_files_different b/both_files_different
+--- a/both_files_different DATE
++++ b/both_files_different DATE
+CONTEXT_LINE_NUMBERS
+-a
++b
+','Common subdirectories: b/both_dirs_empty
+','Common subdirectories: b/dirs_empty_in_b_filled_in_a
+','Common subdirectories: b/dirs_empty_in_a_filled_in_b
+','Only in a: a_only_dir
+','diff --knife a/a_only_file b/a_only_file
+deleted file
+--- a/a_only_file DATE
++++ /dev/null DATE
+CONTEXT_LINE_NUMBERS
+-a_only_file
+','File a/dir_in_a_file_in_b is a directory while file b/dir_in_a_file_in_b is a regular file
+','File a/file_in_a_dir_in_b is a regular file while file b/file_in_a_dir_in_b is a directory
+','Only in b: b_only_dir
+','diff --knife a/b_only_file b/b_only_file
+new file
+--- /dev/null DATE
++++ b/b_only_file DATE
+CONTEXT_LINE_NUMBERS
++b_only_file
+' ]
+    end
+    it 'Chef::ChefFS::CommandLine.diff_print(/) in name-only mode' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_only) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+          "b/both_dirs/sub_both_files_different\n",
+          "b/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub\n",
+          "b/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub\n",
+          "b/both_dirs/sub_a_only_dir\n",
+          "b/both_dirs/sub_a_only_file\n",
+          "b/both_dirs/sub_b_only_dir\n",
+          "b/both_dirs/sub_b_only_file\n",
+          "b/both_dirs/sub_dir_in_a_file_in_b\n",
+          "b/both_dirs/sub_file_in_a_dir_in_b\n",
+          "b/both_files_different\n",
+          "b/dirs_empty_in_b_filled_in_a/subsub\n",
+          "b/dirs_empty_in_a_filled_in_b/subsub\n",
+          "b/a_only_dir\n",
+          "b/a_only_file\n",
+          "b/b_only_dir\n",
+          "b/b_only_file\n",
+          "b/dir_in_a_file_in_b\n",
+          "b/file_in_a_dir_in_b\n"
+      ]
+    end
+    it 'Chef::ChefFS::CommandLine.diff_print(/) in name-status mode' do
+      results = []
+      Chef::ChefFS::CommandLine.diff_print(pattern('/'), a, b, nil, :name_status) do |diff|
+        results << remove_os_differences(diff)
+      end
+      results.should =~ [
+          "M\tb/both_dirs/sub_both_files_different\n",
+          "D\tb/both_dirs/sub_dirs_empty_in_b_filled_in_a/subsub\n",
+          "A\tb/both_dirs/sub_dirs_empty_in_a_filled_in_b/subsub\n",
+          "D\tb/both_dirs/sub_a_only_dir\n",
+          "D\tb/both_dirs/sub_a_only_file\n",
+          "A\tb/both_dirs/sub_b_only_dir\n",
+          "A\tb/both_dirs/sub_b_only_file\n",
+          "T\tb/both_dirs/sub_dir_in_a_file_in_b\n",
+          "T\tb/both_dirs/sub_file_in_a_dir_in_b\n",
+          "M\tb/both_files_different\n",
+          "D\tb/dirs_empty_in_b_filled_in_a/subsub\n",
+          "A\tb/dirs_empty_in_a_filled_in_b/subsub\n",
+          "D\tb/a_only_dir\n",
+          "D\tb/a_only_file\n",
+          "A\tb/b_only_dir\n",
+          "A\tb/b_only_file\n",
+          "T\tb/dir_in_a_file_in_b\n",
+          "T\tb/file_in_a_dir_in_b\n"
+      ]
+    end
+  end
+end