From 2735bfc5ff6599fd3ca9a361484259908d03804d Mon Sep 17 00:00:00 2001 From: Marcos Marado Date: Thu, 9 Apr 2020 19:44:28 +0100 Subject: [PATCH] tests: fix SetupGnuPG test The SetupGnuPG test tries to test the full setup, including the creation of the directories. In order to do that, it create a temporary directory, and redefines the home_dot_repo to point there. When a home_dot_repo directory does not exist, it should be created. The gpg_dir, which should exist inside home_dot_repo, also needs to be created if it does not exist. However, since the gpg_dir path is relative to home_dot_repo, once we redefine one, we need to redifine the other. The failure of this test might have gone unnoticed so far, since in only fails if you do not have a ~/.repoconfig/gnupg/ on the environment you are running the tests on. Change-Id: Ic69d59e56137eea43349a61b5cf81f215c6a7f9a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/262573 Reviewed-by: Mike Frysinger Reviewed-by: David Pursehouse Tested-by: Marcos Marado --- tests/test_wrapper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 136f7f11..e18ceb19 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -304,6 +304,7 @@ class SetupGnuPG(RepoWrapperTestCase): """Make sure it works completely.""" with TemporaryDirectory() as tempdir: self.wrapper.home_dot_repo = tempdir + self.wrapper.gpg_dir = os.path.join(self.wrapper.home_dot_repo, 'gnupg') self.assertTrue(self.wrapper.SetupGnuPG(True)) with open(os.path.join(tempdir, 'keyring-version'), 'r') as fp: data = fp.read()