diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-26 08:57:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-26 08:57:04 -0800 |
| commit | 37a5e29147f0dc489888377d6f7bb53282dc04f9 (patch) | |
| tree | e9fa47a3697f5bfc9ddfc42e6c5676ffcacc378b /python/tidy/servo_tidy_tests/test_tidy.py | |
| parent | c2448d3963508777f1a7485492ec5e9677c875c8 (diff) | |
| parent | b760578f0fd9fb33dd83815ce490410ba9a59f88 (diff) | |
| download | servo-37a5e29147f0dc489888377d6f7bb53282dc04f9.tar.gz servo-37a5e29147f0dc489888377d6f7bb53282dc04f9.zip | |
Auto merge of #14715 - UK992:tidy-check-lock, r=SimonSapin
Tidy: Check Cargo.lock for packages with same version and different sources
<!-- Please describe your changes on the following line: -->
r? @Wafflespeanut
cc @SimonSapin
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14695
<!-- Either: -->
- [X] There are tests for these changes
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/14715)
<!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy_tests/test_tidy.py')
| -rw-r--r-- | python/tidy/servo_tidy_tests/test_tidy.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index 265c485a106..7adcbda2dfe 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -200,13 +200,17 @@ class CheckTidiness(unittest.TestCase): def test_lock(self): errors = tidy.collect_errors_for_files(iterFile('duplicated_package.lock'), [tidy.check_lock], [], print_text=False) - msg = """duplicate versions for package "test" -\t\033[93mfound dependency on version 0.4.9\033[0m -\t\033[91mbut highest version is 0.5.1\033[0m -\t\033[93mtry upgrading with\033[0m \033[96m./mach cargo-update -p test:0.4.9\033[0m -\tThe following packages depend on version 0.4.9: -\t\ttest2""" + msg = """duplicate versions for package `test` +\t\x1b[93mThe following packages depend on version 0.4.9 from 'crates.io':\x1b[0m +\t\ttest2 +\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m""" self.assertEqual(msg, errors.next()[2]) + msg2 = """duplicate versions for package `test3` +\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m +\t\ttest4 +\t\x1b[93mThe following packages depend on version 0.5.1 from 'https://github.com/user/test3':\x1b[0m +\t\ttest5""" + self.assertEqual(msg2, errors.next()[2]) self.assertNoMoreErrors(errors) def test_lint_runner(self): |