Merge branch '2.7rc' into 2.7.x

2 files changed, 18 insertions, 0 deletions

diff --git a/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm b/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
index f773ba17c..f773ba17c 100644
--- a/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rm
+++ b/acceptance/tests/ticket_7139_puppet_resource_file_qualified_paths.rb
diff --git a/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
new file mode 100644
index 000000000..eaa95ff55
--- /dev/null
+++ b/acceptance/tests/ticket_7728_don't_log_whits_on_failure.rb
@@ -0,0 +1,18 @@
+test_name "#7728: Don't log whits on resource failure"
+
+manifest = %Q{
+  class foo {
+    exec { "test": command => "false", path => ['/bin', '/usr/bin'] }
+
+    notify { "before": before  => Exec["test"] }
+    notify { "after":  require => Exec["test"] }
+  }
+
+  include foo
+}
+
+apply_manifest_on(agents, manifest) do
+  assert_match(Regexp.new(Regexp.quote('notice: /Stage[main]/Foo/Notify[after]: Dependency Exec[test] has failures: true')), stdout, "the after dependency must be reported")
+  assert_no_match(Regexp.new(Regexp.quote('Class[Foo]')), stdout, 'the class should not be mentioned')
+  assert_no_match(Regexp.new(Regexp.quote('Stage[Main]')), stdout, 'the class should not be mentioned')
+end