diff options
Diffstat (limited to 'spec/unit/chef_fs/diff_spec.rb')
| -rw-r--r-- | spec/unit/chef_fs/diff_spec.rb | 186 |
1 files changed, 93 insertions, 93 deletions
diff --git a/spec/unit/chef_fs/diff_spec.rb b/spec/unit/chef_fs/diff_spec.rb index e0e507ce89..04f237718b 100644 --- a/spec/unit/chef_fs/diff_spec.rb +++ b/spec/unit/chef_fs/diff_spec.rb @@ -34,57 +34,57 @@ describe "diff", :uses_diff => true do 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/) + :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/) + :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 = [] @@ -98,63 +98,63 @@ describe "diff", :uses_diff => true do 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 +', '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 +', '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 +', "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 +', "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 +', '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 +', '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 +', '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 +', "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 +', "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 @@ -174,29 +174,29 @@ CONTEXT_LINE_NUMBERS 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 +', '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 +', '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 +', "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 +', "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 @@ -211,26 +211,26 @@ CONTEXT_LINE_NUMBERS end expect(results).to match_array([ "Common subdirectories: b/both_dirs -",'diff --knife a/both_files_different b/both_files_different +", '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 +', "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 +', "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 @@ -245,26 +245,26 @@ CONTEXT_LINE_NUMBERS end expect(results).to match_array([ "Common subdirectories: b/both_dirs -",'diff --knife a/both_files_different b/both_files_different +", '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 +', "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 +', "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 |