mirrors/git-repo
1
0
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2026-01-12 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

tests: manifest_xml: convert most path usage to pathlib

Browse Source 
Should be functionally the same, but with pathlib APIs that we've
been slowly adopting in other places, especially unittests.

Change-Id: I81364117f8eaeaf138097cdfc484d4848b7ea5bd
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/525881
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger
2025-11-11 03:40:25 -05:00
committed by LUCI
parent 877ef91be2
commit 5998c0b506
1 changed files with 49 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
tests/test_manifest_xml.py
View File

@@ -15,6 +15,7 @@
"""Unittests for the manifest_xml.py module.""" """Unittests for the manifest_xml.py module."""
import os import os
from pathlib import Path
import platform import platform
import re import re
import tempfile import tempfile
@@ -97,36 +98,34 @@ class ManifestParseTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.tempdirobj = tempfile.TemporaryDirectory(prefix="repo_tests") self.tempdirobj = tempfile.TemporaryDirectory(prefix="repo_tests")
self.tempdir = self.tempdirobj.name self.tempdir = Path(self.tempdirobj.name)
self.repodir = os.path.join(self.tempdir, ".repo") self.repodir = self.tempdir / ".repo"
self.manifest_dir = os.path.join(self.repodir, "manifests") self.manifest_dir = self.repodir / "manifests"
self.manifest_file = os.path.join( self.manifest_file = self.repodir / manifest_xml.MANIFEST_FILE_NAME
self.repodir, manifest_xml.MANIFEST_FILE_NAME self.local_manifest_dir = (
self.repodir / manifest_xml.LOCAL_MANIFESTS_DIR_NAME
) )
self.local_manifest_dir = os.path.join( self.repodir.mkdir()
self.repodir, manifest_xml.LOCAL_MANIFESTS_DIR_NAME self.manifest_dir.mkdir()
)
os.mkdir(self.repodir)
os.mkdir(self.manifest_dir)
# The manifest parsing really wants a git repo currently. # The manifest parsing really wants a git repo currently.
gitdir = os.path.join(self.repodir, "manifests.git") gitdir = self.repodir / "manifests.git"
os.mkdir(gitdir) gitdir.mkdir()
with open(os.path.join(gitdir, "config"), "w") as fp: (gitdir / "config").write_text(
fp.write( """[remote "origin"]
"""[remote "origin"]
url = https://localhost:0/manifest url = https://localhost:0/manifest
""" """
) )
def tearDown(self): def tearDown(self):
self.tempdirobj.cleanup() self.tempdirobj.cleanup()
def getXmlManifest(self, data): def getXmlManifest(self, data):
"""Helper to initialize a manifest for testing.""" """Helper to initialize a manifest for testing."""
with open(self.manifest_file, "w", encoding="utf-8") as fp: self.manifest_file.write_text(data, encoding="utf-8")
fp.write(data) return manifest_xml.XmlManifest(
return manifest_xml.XmlManifest(self.repodir, self.manifest_file) str(self.repodir), str(self.manifest_file)
)
@staticmethod @staticmethod
def encodeXmlAttr(attr): def encodeXmlAttr(attr):
@@ -243,12 +242,14 @@ class XmlManifestTests(ManifestParseTestCase):
def test_link(self): def test_link(self):
"""Verify Link handling with new names.""" """Verify Link handling with new names."""
manifest = manifest_xml.XmlManifest(self.repodir, self.manifest_file) manifest = manifest_xml.XmlManifest(
with open(os.path.join(self.manifest_dir, "foo.xml"), "w") as fp: str(self.repodir), str(self.manifest_file)
fp.write("<manifest></manifest>") )
(self.manifest_dir / "foo.xml").write_text("<manifest></manifest>")
manifest.Link("foo.xml") manifest.Link("foo.xml")
with open(self.manifest_file) as fp: self.assertIn(
self.assertIn('<include name="foo.xml" />', fp.read()) '<include name="foo.xml" />', self.manifest_file.read_text()
)
def test_toxml_empty(self): def test_toxml_empty(self):
"""Verify the ToXml() helper.""" """Verify the ToXml() helper."""
@@ -406,10 +407,9 @@ class IncludeElementTests(ManifestParseTestCase):
def test_revision_default(self): def test_revision_default(self):
"""Check handling of revision attribute.""" """Check handling of revision attribute."""
root_m = os.path.join(self.manifest_dir, "root.xml") root_m = self.manifest_dir / "root.xml"
with open(root_m, "w") as fp: root_m.write_text(
fp.write( """
"""
<manifest> <manifest>
<remote name="test-remote" fetch="http://localhost" /> <remote name="test-remote" fetch="http://localhost" />
<default remote="test-remote" revision="refs/heads/main" /> <default remote="test-remote" revision="refs/heads/main" />
@@ -418,17 +418,16 @@ class IncludeElementTests(ManifestParseTestCase):
<project name="root-name2" path="root-path2" /> <project name="root-name2" path="root-path2" />
</manifest> </manifest>
""" """
) )
with open(os.path.join(self.manifest_dir, "stable.xml"), "w") as fp: (self.manifest_dir / "stable.xml").write_text(
fp.write( """
"""
<manifest> <manifest>
<project name="stable-name1" path="stable-path1" /> <project name="stable-name1" path="stable-path1" />
<project name="stable-name2" path="stable-path2" revision="stable-branch2" /> <project name="stable-name2" path="stable-path2" revision="stable-branch2" />
</manifest> </manifest>
""" """
) )
include_m = manifest_xml.XmlManifest(self.repodir, root_m) include_m = manifest_xml.XmlManifest(str(self.repodir), str(root_m))
for proj in include_m.projects: for proj in include_m.projects:
if proj.name == "root-name1": if proj.name == "root-name1":
# Check include revision not set on root level proj. # Check include revision not set on root level proj.
@@ -444,10 +443,9 @@ class IncludeElementTests(ManifestParseTestCase):
self.assertEqual("stable-branch2", proj.revisionExpr) self.assertEqual("stable-branch2", proj.revisionExpr)
def test_group_levels(self): def test_group_levels(self):
root_m = os.path.join(self.manifest_dir, "root.xml") root_m = self.manifest_dir / "root.xml"
with open(root_m, "w") as fp: root_m.write_text(
fp.write( """
"""
<manifest> <manifest>
<remote name="test-remote" fetch="http://localhost" /> <remote name="test-remote" fetch="http://localhost" />
<default remote="test-remote" revision="refs/heads/main" /> <default remote="test-remote" revision="refs/heads/main" />
@@ -456,25 +454,23 @@ class IncludeElementTests(ManifestParseTestCase):
<project name="root-name2" path="root-path2" groups="r2g1,r2g2" /> <project name="root-name2" path="root-path2" groups="r2g1,r2g2" />
</manifest> </manifest>
""" """
) )
with open(os.path.join(self.manifest_dir, "level1.xml"), "w") as fp: (self.manifest_dir / "level1.xml").write_text(
fp.write( """
"""
<manifest> <manifest>
<include name="level2.xml" groups="level2-group" /> <include name="level2.xml" groups="level2-group" />
<project name="level1-name1" path="level1-path1" /> <project name="level1-name1" path="level1-path1" />
</manifest> </manifest>
""" """
) )
with open(os.path.join(self.manifest_dir, "level2.xml"), "w") as fp: (self.manifest_dir / "level2.xml").write_text(
fp.write( """
"""
<manifest> <manifest>
<project name="level2-name1" path="level2-path1" groups="l2g1,l2g2" /> <project name="level2-name1" path="level2-path1" groups="l2g1,l2g2" />
</manifest> </manifest>
""" """
) )
include_m = manifest_xml.XmlManifest(self.repodir, root_m) include_m = manifest_xml.XmlManifest(str(self.repodir), str(root_m))
for proj in include_m.projects: for proj in include_m.projects:
if proj.name == "root-name1": if proj.name == "root-name1":
# Check include group not set on root level proj. # Check include group not set on root level proj.
@@ -510,9 +506,8 @@ class IncludeElementTests(ManifestParseTestCase):
manifest.ToXml() manifest.ToXml()
# Setup target of the include. # Setup target of the include.
target = os.path.join(self.tempdir, "target.xml") target = self.tempdir / "target.xml"
with open(target, "w") as fp: target.write_text("<manifest></manifest>")
fp.write("<manifest></manifest>")
# Include with absolute path. # Include with absolute path.
parse(os.path.abspath(target)) parse(os.path.abspath(target))
@@ -526,12 +521,9 @@ class IncludeElementTests(ManifestParseTestCase):
def parse(name): def parse(name):
name = self.encodeXmlAttr(name) name = self.encodeXmlAttr(name)
# Setup target of the include. # Setup target of the include.
with open( (self.manifest_dir / "target.xml").write_text(
os.path.join(self.manifest_dir, "target.xml"), f'<manifest><include name="{name}"/></manifest>'
"w", )
encoding="utf-8",
) as fp:
fp.write(f'<manifest><include name="{name}"/></manifest>')
manifest = self.getXmlManifest( manifest = self.getXmlManifest(
""" """