Revert "(MODULES-2506) Fix Failing Tests"

This reverts commit 8f5b737. This should now properly validate that WaitFor* resources are missing
jpogran · Oct 19, 2015 · 5a3fce1 · 5a3fce1
1 parent fb69742
commit 5a3fce1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforall/negative/waitforall_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end
diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforany/negative/waitforany_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end
diff --git a/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb b/tests/acceptance/tests/basic_dsc_resources/waitforsome/negative/waitforsome_blacklist.rb
@@ -23,9 +23,7 @@
 # Tests
 agents.each do |agent|
   step 'Attempt to Apply Manifest'
-  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 0) do |result|
-    expect_failure('Expected to fail because of MODULES-2504') do
-      assert_match(error_msg, result.stderr, 'Expected error was not detected!')
-    end
+  on(agent, puppet('apply'), :stdin => dsc_manifest, :acceptable_exit_codes => 1) do |result|
+    assert_match(error_msg, result.stderr, 'Expected error was not detected!')
   end
 end