diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-28 19:15:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 19:15:59 -0700 |
| commit | 93f40eea9841e1a3659e96ee4f8fa801f673c722 (patch) | |
| tree | 37933554a94b8bcfbb145298fbff4d224d6d5483 | |
| parent | 6a05076d838fc407e3c31003e538d5118558587b (diff) | |
| parent | de9cb76d749caf68d8cdfd5e1e3b7ea45df03d73 (diff) | |
| download | chef-93f40eea9841e1a3659e96ee4f8fa801f673c722.tar.gz | |
Merge pull request #10078 from chef/revert-initial-diff-fix
Revert "Merge pull request #10052 from chef/fix-diff-tests"
| -rw-r--r-- | spec/unit/chef_fs/diff_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/unit/chef_fs/diff_spec.rb b/spec/unit/chef_fs/diff_spec.rb index 88cd6540e5..726adf8e50 100644 --- a/spec/unit/chef_fs/diff_spec.rb +++ b/spec/unit/chef_fs/diff_spec.rb @@ -26,10 +26,9 @@ describe "diff", uses_diff: true do # 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" - # https://rubular.com/r/5JdtZDqWnZhB9J def remove_os_differences(diff) diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE') - diff.gsub(/^@@ -\d(,\d)? \+-?\d(,-?\d)? @@/, "CONTEXT_LINE_NUMBERS") + diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS") end context "with two filesystems with all types of difference" do |