repo: Add strict to zip calls

By default, if iterables passed to zip have different lengths, the
resulting iterator will be silently truncated to the length of the
shortest.
The `strict` argument was introduced in Python 3.10 and should be explicit
for all zip function calls. This is also verified with the
flake8-bugbear linter checks in ruff.

Signed-off-by: Pieter De Gendt <[email protected]>

Author: pdgendt

tests/test_manifest.py

@@ -393,7 +393,7 @@ def test_project_revisions():
     ''')
     expected = [Project('p1', 'u1', revision='defaultrev'),
                 Project('p2', 'u2', revision='rev')]
-    for p, e in zip(m.projects[1:], expected):
+    for p, e in zip(m.projects[1:], expected, strict=True):
         check_proj_consistency(p, e)
 
     # The default revision, if not given in a defaults section, is
@@ -776,7 +776,7 @@ def test_self_tag():
                 Project('testproject2', 'https://example2.com/testproject2')]
 
     # Check the projects are as expected.
-    for p, e in zip(m.projects, expected):
+    for p, e in zip(m.projects, expected, strict=True):
         check_proj_consistency(p, e)
 
     # With a "self: path:" value, that will be available in the
@@ -1726,7 +1726,7 @@ def test_import_basics(content):
                 revision='segger-upstream-rev',
                 path='modules/debug/segger')]
 
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_with_fork_and_proj():
@@ -1766,7 +1766,7 @@ def test_import_with_fork_and_proj():
                 revision='segger-upstream-rev',
                 path='modules/debug/segger')]
 
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_project_list(manifest_repo):
@@ -1815,7 +1815,7 @@ def test_import_project_list(manifest_repo):
                 Project('p2', 'p2-url', topdir=topdir),
                 Project('p3', 'p3-url', topdir=topdir)]
 
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_project_directory(manifest_repo):
@@ -1867,7 +1867,7 @@ def test_import_project_directory(manifest_repo):
                 Project('p2', 'p2-url', topdir=topdir),
                 Project('p3', 'p3-url', topdir=topdir)]
 
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_project_err_malformed(manifest_repo):
@@ -2211,7 +2211,7 @@ def test_import_self_directory(content, tmp_workspace):
     assert [a.name for a in actual] == [e.name for e in expected]
 
     # With the basic check done, do a more detailed check.
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_self_bool():
@@ -2674,7 +2674,7 @@ def test_import_path_prefix_basics(manifest_repo):
                         path='prefix/2/not-cloned-2', topdir=topdir),
                 Project('not-cloned-3', 'https://example.com/not-cloned-3',
                         path='pre/fix/3/not-cloned-3', topdir=topdir)]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_path_prefix_self(manifest_repo):
@@ -2760,7 +2760,7 @@ def test_import_path_prefix_propagation(manifest_repo):
                 Project('project-2', 'https://example.com/project-2',
                         path='prefix/1/prefix-2/project-2',
                         topdir=topdir)]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_path_prefix_no_escape(manifest_repo):

tests/test_project.py

@@ -92,7 +92,7 @@ def _list_f(format):
 
 
 def _match_multiline_regex(expected, actual):
-    for eline_re, aline in zip(expected, actual):
+    for eline_re, aline in zip(expected, actual, strict=True):
         assert re.match(eline_re, aline) is not None, (aline, eline_re)
 
 
@@ -2374,7 +2374,7 @@ def test_import_project_release(repos_tmpdir):
                 Project('net-tools', remotes / 'net-tools',
                         clone_depth=1, topdir=ws,
                         west_commands='scripts/west-commands.yml')]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
     # Add a commit in the remote zephyr repository and make sure it
@@ -2389,7 +2389,7 @@ def test_import_project_release(repos_tmpdir):
 
     assert head_before == rev_parse(zephyr_ws, 'HEAD')
     actual = Manifest.from_topdir(topdir=ws).projects
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
     assert (zephyr_ws / 'should-not-clone').check(file=0)
 
@@ -2443,7 +2443,7 @@ def test_import_project_release_fork(repos_tmpdir):
                 Project('net-tools', remotes / 'net-tools',
                         clone_depth=1, topdir=ws,
                         west_commands='scripts/west-commands.yml')]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
     zephyr_ws = ws / 'zephyr'
@@ -2455,7 +2455,7 @@ def test_import_project_release_fork(repos_tmpdir):
 
     assert head_before == rev_parse(zephyr_ws, 'HEAD')
     actual = Manifest.from_topdir(topdir=ws).projects
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
     assert (zephyr_ws / 'should-not-clone').check(file=0)
 
@@ -2514,7 +2514,7 @@ def test_import_project_release_dir(tmpdir):
                 Project('west.d_1.yml-p1', empty_project, topdir=ws),
                 Project('west.d_1.yml-p2', empty_project, topdir=ws),
                 Project('west.d_2.yml-p1', empty_project, topdir=ws)]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
 def test_import_project_rolling(repos_tmpdir):
@@ -2557,7 +2557,7 @@ def test_import_project_rolling(repos_tmpdir):
                 Project('net-tools', remotes / 'net-tools',
                         clone_depth=1, topdir=ws,
                         west_commands='scripts/west-commands.yml')]
-    for a, e in zip(actual, expected):
+    for a, e in zip(actual, expected, strict=True):
         check_proj_consistency(a, e)
 
     # Add a commit in the remote zephyr repository and make sure it