Merge pull request #6 from wvu-r7/pr/5171

Consolidate on one check and fix false positives

Author: firefart

tools/msftidy.rb

@@ -546,9 +546,7 @@ def check_lines
       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