Merge isolated-functional-tests-1010392-2 (rwall)

hawkowl · hawkowl · commit 14249580b498 · 2013-10-23T22:26:10.000+08:00
diff --git a/twistedchecker/core/runner.py b/twistedchecker/core/runner.py
@@ -1,4 +1,7 @@
 # -*- test-case-name: twistedchecker.test.test_runner -*-
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+
 import sys
 import os
 import StringIO
diff --git a/twistedchecker/functionaltests/__init__.py b/twistedchecker/functionaltests/__init__.py
@@ -1,4 +1,7 @@
+# -*- test-case-name: twistedchecker.test.test_functionaltests -*-
+# Copyright (c) Twisted Matrix Laboratories.
+# See LICENSE for details.
+
 """
 Input test files of TwistedChecker.
 """
-
diff --git a/twistedchecker/functionaltests/attributename_fail.result b/twistedchecker/functionaltests/attributename_fail.result
@@ -1,4 +1,4 @@
-19: C0103
-18: C0103
-16: C0103
-17: C0103
+19:C0103
+18:C0103
+16:C0103
+17:C0103
diff --git a/twistedchecker/functionaltests/blanklines_fail.result b/twistedchecker/functionaltests/blanklines_fail.result
@@ -1,5 +1,5 @@
-11: W9012
-15: W9013
-28: W9013
-40: W9016
-45: W9015
+11:W9012
+15:W9013
+28:W9013
+40:W9016
+45:W9015
diff --git a/twistedchecker/functionaltests/classname_fail.result b/twistedchecker/functionaltests/classname_fail.result
@@ -1,3 +1,3 @@
-3: C0103
-10: C0103
-17: C0103
+3:C0103
+10:C0103
+17:C0103
diff --git a/twistedchecker/functionaltests/comments.result b/twistedchecker/functionaltests/comments.result
@@ -1,4 +1,4 @@
-1: W9402
-3: W9401
-5: W9401
-7: W9402
+1:W9402
+3:W9401
+5:W9401
+7:W9402
diff --git a/twistedchecker/functionaltests/copyright_fail.result b/twistedchecker/functionaltests/copyright_fail.result
@@ -1 +1 @@
-1: W9001
+1:W9001
diff --git a/twistedchecker/functionaltests/copyright_oneline_fail.result b/twistedchecker/functionaltests/copyright_oneline_fail.result
@@ -1 +1 @@
-1: W9001
+1:W9001
diff --git a/twistedchecker/functionaltests/copyright_reversed_fail.result b/twistedchecker/functionaltests/copyright_reversed_fail.result
@@ -1 +1 @@
-1: W9001
+1:W9001
diff --git a/twistedchecker/functionaltests/docstring_fail.result b/twistedchecker/functionaltests/docstring_fail.result
@@ -18,4 +18,4 @@
 87:W9203
 95:W9208
 100:W9209
-108:W9208
+108:W9208
diff --git a/twistedchecker/functionaltests/extra_ending_blankline.result b/twistedchecker/functionaltests/extra_ending_blankline.result
@@ -1 +1 @@
-4: W9017
+4:W9017
diff --git a/twistedchecker/functionaltests/formattingoperation.result b/twistedchecker/functionaltests/formattingoperation.result
@@ -1,2 +1,2 @@
-6: W9501
-8: W9501
+6:W9501
+8:W9501
diff --git a/twistedchecker/functionaltests/general_pep8.result b/twistedchecker/functionaltests/general_pep8.result
@@ -1,10 +1,10 @@
-4: W9019
-7: W9020
-10: W9021
-16: W9022
-19: W9023
-22: W9024
-28: W9025
-28: W9025
-34: W9026
-47: W9027
+4:W9019
+7:W9020
+10:W9021
+16:W9022
+19:W9023
+22:W9024
+28:W9025
+28:W9025
+34:W9026
+47:W9027
diff --git a/twistedchecker/functionaltests/indentation.result b/twistedchecker/functionaltests/indentation.result
@@ -1,2 +1,2 @@
-9: W0311
-13: W0312
+9:W0311
+13:W0312
diff --git a/twistedchecker/functionaltests/maxlinelength.result b/twistedchecker/functionaltests/maxlinelength.result
@@ -1 +1 @@
-3: C0301
+3:C0301
diff --git a/twistedchecker/functionaltests/methodname_fail.result b/twistedchecker/functionaltests/methodname_fail.result
@@ -1,4 +1,4 @@
-9: C0103
-13: C0103
-17: C0103
-21: C0103
+9:C0103
+13:C0103
+17:C0103
+21:C0103
diff --git a/twistedchecker/functionaltests/moduleName_fail.result b/twistedchecker/functionaltests/moduleName_fail.result
@@ -1 +1 @@
-1: C0103
+1:C0103
diff --git a/twistedchecker/functionaltests/module_docstring_fail.result b/twistedchecker/functionaltests/module_docstring_fail.result
@@ -1 +1 @@
-1: W9208
+1:W9208
diff --git a/twistedchecker/functionaltests/no_ending_blankline.result b/twistedchecker/functionaltests/no_ending_blankline.result
@@ -1 +1 @@
-4: W9018
+4:W9018
diff --git a/twistedchecker/functionaltests/py3_apply_fail.result b/twistedchecker/functionaltests/py3_apply_fail.result
@@ -1,2 +1,2 @@
-11: W9603
-15: W9603
+11:W9603
+15:W9603
diff --git a/twistedchecker/functionaltests/py3_exceptions.result b/twistedchecker/functionaltests/py3_exceptions.result
@@ -1,4 +1,4 @@
-16: W9604
-21: W9604
-29: W9604
-36: W9604
+16:W9604
+21:W9604
+29:W9604
+36:W9604
diff --git a/twistedchecker/functionaltests/py3_haskey.result b/twistedchecker/functionaltests/py3_haskey.result
@@ -1,2 +1,2 @@
-6: W9602
-11: W9602
+6:W9602
+11:W9602
diff --git a/twistedchecker/functionaltests/py3_print_fail.result b/twistedchecker/functionaltests/py3_print_fail.result
@@ -1 +1 @@
-1: W9601
+1:W9601
diff --git a/twistedchecker/functionaltests/referencetotest_fail.result b/twistedchecker/functionaltests/referencetotest_fail.result
@@ -1 +1 @@
-1: W9002
+1:W9002
diff --git a/twistedchecker/functionaltests/test/testmodulename_fail.result b/twistedchecker/functionaltests/test/testmodulename_fail.result
@@ -1 +1 @@
-1: W9301
+1:W9301
diff --git a/twistedchecker/functionaltests/trailingspace.result b/twistedchecker/functionaltests/trailingspace.result
@@ -1,2 +1,2 @@
-4: W9010
-7: W9011
+4:W9010
+7:W9011
diff --git a/twistedchecker/functionaltests/variablename_fail.result b/twistedchecker/functionaltests/variablename_fail.result
@@ -1,4 +1,4 @@
-11: C0103
-12: C0103
-13: C0103
-14: C0103
+11:C0103
+12:C0103
+13:C0103
+14:C0103
diff --git a/twistedchecker/reporters/test.py b/twistedchecker/reporters/test.py
@@ -33,4 +33,4 @@ def add_message(self, msg_id, location, msg):
         @param msg: text add_message
         """
         module, obj, line, col_offset = location[1:]
-        self.writeln('%s: %s' % (line, msg_id))
+        self.writeln('%s:%s' % (line, msg_id))
diff --git a/twistedchecker/test/test_functionaltests.py b/twistedchecker/test/test_functionaltests.py
diff --git a/twistedchecker/test/test_runner.py b/twistedchecker/test/test_runner.py
