android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: test_subcmds_sync.py: fix for py3.6 & 3.7

Browse Source 
tests/test_subcmds_sync.py::LocalSyncState::test_prune_removed_projects
was failing in Python 3.6 and 3.7 due to topdir not being set with the
following error message:
    TypeError: expected str, bytes or os.PathLike object, not MagicMock

topdir is accessed from within PruneRemovedProjects().

Test: tox with Python 3.6 to 3.11
Change-Id: I7ba5144df0a0126c01776384e2178136c3510091
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/382816
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Daniel Kutik <daniel.kutik@lavawerk.com>
Tested-by: Daniel Kutik <daniel.kutik@lavawerk.com>
This commit is contained in:
Daniel Kutik 2023-08-15 15:59:07 +02:00 committed by LUCI
parent da6ae1da8b
commit 880c621dc6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_subcmds_sync.py
View File

@ -117,8 +117,12 @@ class LocalSyncState(unittest.TestCase):
def setUp(self): def setUp(self):
"""Common setup.""" """Common setup."""
self.repodir = tempfile.mkdtemp(".repo") self.topdir = tempfile.mkdtemp("LocalSyncState")
self.repodir = os.path.join(self.topdir, ".repo")
os.makedirs(self.repodir)
self.manifest = mock.MagicMock( self.manifest = mock.MagicMock(
topdir=self.topdir,
repodir=self.repodir, repodir=self.repodir,
repoProject=mock.MagicMock(relpath=".repo/repo"), repoProject=mock.MagicMock(relpath=".repo/repo"),
) )
@ -126,7 +130,7 @@ class LocalSyncState(unittest.TestCase):
def tearDown(self): def tearDown(self):
"""Common teardown.""" """Common teardown."""
shutil.rmtree(self.repodir) shutil.rmtree(self.topdir)
def _new_state(self, time=_TIME): def _new_state(self, time=_TIME):
with mock.patch("time.time", return_value=time): with mock.patch("time.time", return_value=time):