From 0f075170497fc5ec4a396062d5fe46807d235d22 Mon Sep 17 00:00:00 2001 From: UK992 Date: Thu, 25 Aug 2016 01:29:46 +0200 Subject: [PATCH] Check for license only in Cargo.toml --- python/tidy/servo_tidy/tidy.py | 7 +++---- python/tidy/servo_tidy_tests/{test.toml => Cargo.toml} | 0 python/tidy/servo_tidy_tests/test_tidy.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) rename python/tidy/servo_tidy_tests/{test.toml => Cargo.toml} (100%) diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index a23c444c9db..de3f83b84bd 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -29,11 +29,10 @@ config = { "skip-check-licenses": False, "ignore": { "files": [ - CONFIG_FILE_PATH, # ignore config file - "./.", # ignore hidden files + "./.", # ignore hidden files ], "directories": [ - "./.", # ignore hidden directories + "./.", # ignore hidden directories ], "packages": [], } @@ -312,7 +311,7 @@ duplicate versions for package "{package}" def check_toml(file_name, lines): - if not file_name.endswith(".toml"): + if not file_name.endswith("Cargo.toml"): raise StopIteration ok_licensed = False for idx, line in enumerate(lines): diff --git a/python/tidy/servo_tidy_tests/test.toml b/python/tidy/servo_tidy_tests/Cargo.toml similarity index 100% rename from python/tidy/servo_tidy_tests/test.toml rename to python/tidy/servo_tidy_tests/Cargo.toml diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index f65ffa55d37..746783d1759 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -117,7 +117,7 @@ class CheckTidiness(unittest.TestCase): self.assertNoMoreErrors(errors) def test_toml(self): - errors = tidy.collect_errors_for_files(iterFile('test.toml'), [tidy.check_toml], [], print_text=False) + errors = tidy.collect_errors_for_files(iterFile('Cargo.toml'), [tidy.check_toml], [], print_text=False) self.assertEqual('found asterisk instead of minimum version number', errors.next()[2]) self.assertEqual('.toml file should contain a valid license.', errors.next()[2]) self.assertNoMoreErrors(errors)