Add self-test and modify tidy to accomodate the test

servo · Feb 1, 2018 · bcb4bd2 · bcb4bd2
1 parent 41bf866
commit bcb4bd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -33,6 +33,11 @@ def test_tidy_config(self):
         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'],