Consolidate on one check and fix false positives

2015-04-16 18:00:08 -05:00 · 2015-04-16 18:00:08 -05:00 · 832487cad7
parent 40f6b086c2
commit 832487cad7
1 changed files with 1 additions and 3 deletions
--- a/tools/msftidy.rb
+++ b/tools/msftidy.rb
@ -546,9 +546,7 @@ class Msftidy
      end

      if ln =~ /^\s*fail_with\(/
-        if ln =~ /^\s*fail_with\(['"].+['"]\)/
-          error("fail_with requires a Failure:: reason as first parameter: #{ln}", idx)
-        elsif ln !~ /^\s*fail_with\(Failure\:\:(?:None|Unknown|Unreachable|BadConfig|Disconnected|NotFound|UnexpectedReply|TimeoutExpired|UserInterrupt|NoAccess|NoTarget|NotVulnerable|PayloadFailed),.+\)/
+        unless ln =~ /^\s*fail_with\(Failure\:\:(?:None|Unknown|Unreachable|BadConfig|Disconnected|NotFound|UnexpectedReply|TimeoutExpired|UserInterrupt|NoAccess|NoTarget|NotVulnerable|PayloadFailed),/
          error("fail_with requires a valid Failure:: reason as first parameter: #{ln}", idx)
        end
      end