Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Auto merge of #10775 - mskrzypkows:tidy_tests, r=Wafflespeanut
Test for tidy.check_lock function #9152

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10775)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Apr 25, 2016
2 parents 20dd8ba + f090425 commit edb5804
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
21 changes: 21 additions & 0 deletions python/tidy/servo_tidy_tests/duplicated_package.lock
@@ -0,0 +1,21 @@
[root]
name = "servo"
version = "0.0.1"

[[package]]
name = "test"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "test"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "test2"
version = "0.1.0"
source = "git+https://github.com/"
dependencies = [
"test 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
12 changes: 12 additions & 0 deletions python/tidy/servo_tidy_tests/test_tidy.py
Expand Up @@ -96,6 +96,18 @@ def test_modeline(self):
self.assertEqual('vi modeline present', errors.next()[2])
self.assertEqual('emacs file variables present', errors.next()[2])
self.assertEqual('emacs file variables present', errors.next()[2])
self.assertNoMoreErrors(errors)

def test_lock(self):
errors = tidy.collect_errors_for_files(iterFile('duplicated_package.lock'), [tidy.check_lock], [])
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"""
self.assertEqual(msg, errors.next()[2])
self.assertNoMoreErrors(errors)


def do_tests():
Expand Down

0 comments on commit edb5804

Please sign in to comment.