Allow differing leading/trailing whitespace when checking test output

Author: briancroom

Tests/Functional/xctest_checker/tests/test_compare.py

@@ -54,5 +54,10 @@ def test_includes_file_name_and_line_of_expected_in_error(self):
 
         self.assertIn("{}:{}:".format(expected, 2), cm.exception.message)
 
+    def test_matching_ignores_leading_trailing_whitespace(self):
+        actual = _tmpfile('foo\nbar\nbaz\n')
+        expected = _tmpfile('c:  foo\nc: bar \nc: baz\n')
+        compare.compare(actual, expected, check_prefix='c: ')
+
 if __name__ == "__main__":
     unittest.main()

Tests/Functional/xctest_checker/xctest_checker/compare.py

@@ -52,7 +52,7 @@ def compare(actual, expected, check_prefix):
 
         (expected_line, expectation_source_line_number) = expected_line_and_line_number
 
-        if not re.match(expected_line, actual_line):
+        if not re.match(expected_line.strip(), actual_line.strip()):
             raise AssertionError('Actual line did not match the expected '
                                  'regular expression.\n'
                                  '{}:{}: Actual: {}\n'