Add self-test and modify tidy to accomodate the test

2 files changed, 7 insertions, 2 deletions

diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 5a050d11f4a..fa3a610a41d 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -461,8 +461,8 @@ def rec_parse(current_path, current_node):
 
 def check_manifest_dirs(config_file, print_text=True):
     if not os.path.exists(config_file):
-        print("%s manifest file is required but was not found" % config_file)
-        sys.exit(1)
+        yield(config_file, 0, "%s manifest file is required but was not found" % config_file)
+        return
 
     # Load configs from include.ini
     with open(config_file) as content:
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
index 432d5c1117e..1c4a055a665 100644
--- a/python/tidy/servo_tidy_tests/test_tidy.py
+++ b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -33,6 +33,11 @@ class CheckTidiness(unittest.TestCase):
         self.assertEqual("ignored directory './fake/dir' doesn't exist", errors.next()[2])
         self.assertNoMoreErrors(errors)
 
+    def test_wpt_manifest_checks(self):
+        wrong_path = "/wrong/path.ini"
+        errors = tidy.check_manifest_dirs(wrong_path)
+        self.assertEqual("%s manifest file is required but was not found" % wrong_path, errors.next()[2])
+
     def test_directory_checks(self):
         dirs = {
             os.path.join(base_path, "dir_check/webidl_plus"): ['webidl', 'test'],