From 0297f8312c5cd80cf5d2ffc3f0915b00647b03e5 Mon Sep 17 00:00:00 2001 From: Daniel Kutik Date: Sun, 27 Nov 2022 13:26:15 +0100 Subject: [PATCH] test: fix path seperator errors on windows Fixing multiple errors when running tests on Windows related to path seperator being different ('\' instead of '/'). Signed-off-by: Daniel Kutik Change-Id: I26b44d092b925edecab46a4d88e77dd9dcb8df28 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/353178 Reviewed-by: Mike Frysinger --- tests/test_git_command.py | 10 +++++----- tests/test_manifest_xml.py | 28 ++++++++++++++-------------- tests/test_project.py | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/test_git_command.py b/tests/test_git_command.py index aaf21219..ff0d395d 100644 --- a/tests/test_git_command.py +++ b/tests/test_git_command.py @@ -42,21 +42,21 @@ class GitCommandTest(unittest.TestCase): def test_alternative_setting_when_matching(self): r = git_command._build_env( - objdir = 'zap/objects', + objdir = os.path.join('zap', 'objects'), gitdir = 'zap' ) self.assertIsNone(r.get('GIT_ALTERNATE_OBJECT_DIRECTORIES')) - self.assertEqual(r.get('GIT_OBJECT_DIRECTORY'), 'zap/objects') + self.assertEqual(r.get('GIT_OBJECT_DIRECTORY'), os.path.join('zap', 'objects')) def test_alternative_setting_when_different(self): r = git_command._build_env( - objdir = 'wow/objects', + objdir = os.path.join('wow', 'objects'), gitdir = 'zap' ) - self.assertEqual(r.get('GIT_ALTERNATE_OBJECT_DIRECTORIES'), 'zap/objects') - self.assertEqual(r.get('GIT_OBJECT_DIRECTORY'), 'wow/objects') + self.assertEqual(r.get('GIT_ALTERNATE_OBJECT_DIRECTORIES'), os.path.join('zap', 'objects')) + self.assertEqual(r.get('GIT_OBJECT_DIRECTORY'), os.path.join('wow', 'objects')) class GitCallUnitTest(unittest.TestCase): diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py index f92108e1..0e649a67 100644 --- a/tests/test_manifest_xml.py +++ b/tests/test_manifest_xml.py @@ -519,22 +519,22 @@ class ProjectElementTests(ManifestParseTestCase): """) manifest = parse('a/path/', 'foo') - self.assertEqual(manifest.projects[0].gitdir, - os.path.join(self.tempdir, '.repo/projects/foo.git')) - self.assertEqual(manifest.projects[0].objdir, - os.path.join(self.tempdir, '.repo/project-objects/a/path.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].gitdir), + os.path.join(self.tempdir, '.repo', 'projects', 'foo.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].objdir), + os.path.join(self.tempdir, '.repo', 'project-objects', 'a', 'path.git')) manifest = parse('a/path', 'foo/') - self.assertEqual(manifest.projects[0].gitdir, - os.path.join(self.tempdir, '.repo/projects/foo.git')) - self.assertEqual(manifest.projects[0].objdir, - os.path.join(self.tempdir, '.repo/project-objects/a/path.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].gitdir), + os.path.join(self.tempdir, '.repo', 'projects', 'foo.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].objdir), + os.path.join(self.tempdir, '.repo', 'project-objects', 'a', 'path.git')) manifest = parse('a/path', 'foo//////') - self.assertEqual(manifest.projects[0].gitdir, - os.path.join(self.tempdir, '.repo/projects/foo.git')) - self.assertEqual(manifest.projects[0].objdir, - os.path.join(self.tempdir, '.repo/project-objects/a/path.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].gitdir), + os.path.join(self.tempdir, '.repo', 'projects', 'foo.git')) + self.assertEqual(os.path.normpath(manifest.projects[0].objdir), + os.path.join(self.tempdir, '.repo', 'project-objects', 'a', 'path.git')) def test_toplevel_path(self): """Check handling of path=. specially.""" @@ -551,8 +551,8 @@ class ProjectElementTests(ManifestParseTestCase): for path in ('.', './', './/', './//'): manifest = parse('server/path', path) - self.assertEqual(manifest.projects[0].gitdir, - os.path.join(self.tempdir, '.repo/projects/..git')) + self.assertEqual(os.path.normpath(manifest.projects[0].gitdir), + os.path.join(self.tempdir, '.repo', 'projects', '..git')) def test_bad_path_name_checks(self): """Check handling of bad path & name attributes.""" diff --git a/tests/test_project.py b/tests/test_project.py index 5c600be7..47018d1c 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -384,7 +384,7 @@ class MigrateWorkTreeTests(unittest.TestCase): # Make sure the dir was transformed into a symlink. self.assertTrue(dotgit.is_symlink()) - self.assertEqual(os.readlink(dotgit), '../../.repo/projects/src/test.git') + self.assertEqual(os.readlink(dotgit), os.path.normpath('../../.repo/projects/src/test.git')) # Make sure files were moved over. gitdir = tempdir / '.repo/projects/src/test.git'