Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix output of test-tidy with duplicated packages.

Browse source
This commit is contained in:
Josh Matthews 2020-05-20 14:19:47 -04:00
parent 1f4acb940b
commit 4fec987221
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python/tidy/servo_tidy/tidy.py
View file

@ -352,8 +352,10 @@ def check_lock(file_name, contents):
def find_reverse_dependencies(name, content): def find_reverse_dependencies(name, content):
for package in itertools.chain([content.get("root", {})], content["package"]): for package in itertools.chain([content.get("root", {})], content["package"]):
for dependency in package.get("dependencies", []): for dependency in package.get("dependencies", []):
if dependency.startswith("{} ".format(name)): parts = dependency.split()
yield package["name"], dependency dependency = (parts[0], parts[1] if len(parts) > 1 else None, parts[2] if len(parts) > 2 else None)
if dependency[0] == name:
yield package["name"], package["version"], dependency
if not file_name.endswith(".lock"): if not file_name.endswith(".lock"):
raise StopIteration raise StopIteration
@ -394,9 +396,9 @@ def check_lock(file_name, contents):
short_source = source.split("#")[0].replace("git+", "") short_source = source.split("#")[0].replace("git+", "")
message += "\n\t\033[93mThe following packages depend on version {} from '{}':\033[0m" \ message += "\n\t\033[93mThe following packages depend on version {} from '{}':\033[0m" \
.format(version, short_source) .format(version, short_source)
for name, dependency in packages_dependencies: for pname, package_version, dependency in packages_dependencies:
if version in dependency and short_source in dependency: if version in dependency[1] and (not dependency[2] or short_source in dependency[2]):
message += "\n\t\t" + name message += "\n\t\t" + pname + " " + package_version
yield (1, message) yield (1, message)
# Check to see if we are transitively using any blocked packages # Check to see if we are transitively using any blocked packages

5
python/tidy/servo_tidy_tests/duplicated_package.lock
View file

@ -17,13 +17,16 @@ name = "test2"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/user/test2#c54edsf" source = "git+https://github.com/user/test2#c54edsf"
dependencies = [ dependencies = [
"test 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "test 0.4.9",
] ]
[[package]] [[package]]
name = "test3" name = "test3"
version = "0.5.1" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"test 0.5.1",
]
[[package]] [[package]]
name = "test3" name = "test3"

9
python/tidy/servo_tidy_tests/test_tidy.py
View file

@ -195,14 +195,15 @@ class CheckTidiness(unittest.TestCase):
errors = tidy.collect_errors_for_files(iterFile('duplicated_package.lock'), [tidy.check_lock], [], print_text=False) errors = tidy.collect_errors_for_files(iterFile('duplicated_package.lock'), [tidy.check_lock], [], print_text=False)
msg = """duplicate versions for package `test` msg = """duplicate versions for package `test`
\t\x1b[93mThe following packages depend on version 0.4.9 from 'crates.io':\x1b[0m \t\x1b[93mThe following packages depend on version 0.4.9 from 'crates.io':\x1b[0m
\t\ttest2 \t\ttest2 0.1.0
\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m""" \t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m
\t\ttest3 0.5.1"""
self.assertEqual(msg, next(errors)[2]) self.assertEqual(msg, next(errors)[2])
msg2 = """duplicate versions for package `test3` msg2 = """duplicate versions for package `test3`
\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m \t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m
\t\ttest4 \t\ttest4 0.1.0
\t\x1b[93mThe following packages depend on version 0.5.1 from 'https://github.com/user/test3':\x1b[0m \t\x1b[93mThe following packages depend on version 0.5.1 from 'https://github.com/user/test3':\x1b[0m
\t\ttest5""" \t\ttest5 0.1.0"""
self.assertEqual(msg2, next(errors)[2]) self.assertEqual(msg2, next(errors)[2])
self.assertNoMoreErrors(errors) self.assertNoMoreErrors(errors)