aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy_tests/test_tidy.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-01 16:17:00 -0500
committerGitHub <noreply@github.com>2016-10-01 16:17:00 -0500
commita83ef43be0773a52a5e40d05127fbc8814d6caa5 (patch)
treec4239d6087866357bf155e2cb6f31476de244095 /python/tidy/servo_tidy_tests/test_tidy.py
parent34fa38fd2dd75b0278002db847c392e0bb5b3d25 (diff)
parent4846be1fdb9c3127a2dedc474c370efcf7439b0e (diff)
downloadservo-a83ef43be0773a52a5e40d05127fbc8814d6caa5.tar.gz
servo-a83ef43be0773a52a5e40d05127fbc8814d6caa5.zip
Auto merge of #13538 - mschmo:master, r=Wafflespeanut
Avoid unecessary loop evaluation on empty lines for tidy check_license Refactored file line loop in `check_license()` to skip when a blank line is encountered. Only difference should be a very very small performance boost. Also changed the name of a test from the mispelling `test_licence()` to `test_license()` --- - [ ] `./mach build -d` does not report any errors (I'm not able to download the rust compiler on my laptop due to me probably just needing to update openssl: `Error downloading Rust compiler: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed (_ssl.c:590). The failing URL was: https://static-rust-lang-org.s3.amazonaws.com/dist/2016-09-21/rustc-nightly-x86_64-apple-darwin.tar.gz`) - [X] `./mach test-tidy` does not report any errors <!-- Either: --> - [X] There are no added tests for this since `test_license()`, `test_shebang_license()` and `test_apache2_incomplete()` should suffice in this case. Though I'd be more than happy to add a test if requested. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13538) <!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy_tests/test_tidy.py')
-rw-r--r--python/tidy/servo_tidy_tests/test_tidy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
index 52371b944bb..4bf21cfa5e4 100644
--- a/python/tidy/servo_tidy_tests/test_tidy.py
+++ b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -55,7 +55,7 @@ class CheckTidiness(unittest.TestCase):
self.assertTrue('links to WHATWG single-page url, change to multi page:' in errors.next()[2])
self.assertNoMoreErrors(errors)
- def test_licence(self):
+ def test_license(self):
errors = tidy.collect_errors_for_files(iterFile('incorrect_license.rs'), [], [tidy.check_license], print_text=False)
self.assertEqual('incorrect license', errors.next()[2])
self.assertNoMoreErrors(errors)