diff options
Diffstat (limited to 'tests/test_gitrepo.py')
| -rw-r--r-- | tests/test_gitrepo.py | 81 |
1 files changed, 44 insertions, 37 deletions
diff --git a/tests/test_gitrepo.py b/tests/test_gitrepo.py index d1ec23f..505c126 100644 --- a/tests/test_gitrepo.py +++ b/tests/test_gitrepo.py @@ -13,93 +13,100 @@ class TestGitRepo(unittest.TestCase): self.tmpdir = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, self.tmpdir) - self.main = gitrepo.Repo(self.tmpdir, 'main', None) + self.main = gitrepo.Repo(self.tmpdir, "main", None) os.mkdir(self.main.path) - subprocess.check_call(['git', 'init'], cwd=self.main.path) + subprocess.check_call(["git", "init"], cwd=self.main.path) def _add_commit(self, path, content, message): - with open(os.path.join(self.main.path, path), 'w') as f: + with open(os.path.join(self.main.path, path), "w") as f: f.write(content) - subprocess.check_call(['git', 'add', '.'], cwd=self.main.path) subprocess.check_call( - ['git', 'commit', '-a', '-m', message], cwd=self.main.path) + ["git", "add", "."], cwd=self.main.path, text=True) + subprocess.check_call( + ["git", "commit", "-a", "-m", message], cwd=self.main.path, + text=True + ) return self._last_commit() def _last_commit(self): out = subprocess.check_output( - ['git', 'log', '--format=oneline', '-1'], cwd=self.main.path) - return out.split(' ')[0] + ["git", "log", "--format=oneline", "-1"], cwd=self.main.path, + text=True + ) + return out.split(" ")[0] def test_pull_simple(self): - self._add_commit('foo1', 'commit1', 'commit1') - self._add_commit('foo2', 'commit2', 'commit2') + self._add_commit("foo1", "commit1", "commit1") + self._add_commit("foo2", "commit2", "commit2") - repo = gitrepo.Repo(self.tmpdir, 'clone', self.main.path) + repo = gitrepo.Repo(self.tmpdir, "clone", self.main.path) repo._clone() commits = [] - commits.append(self._add_commit('foo3', 'commit3', 'commit3')) - commits.append(self._add_commit('foo4', 'commit4', 'commit4')) + commits.append(self._add_commit("foo3", "commit3", "commit3")) + commits.append(self._add_commit("foo4", "commit4", "commit4")) repo.update() out = subprocess.check_output( - ['git', 'log', '--format=oneline', '-2'], cwd=repo.path) - found = [x.split(' ')[0] for x in out.split('\n') if x] + ["git", "log", "--format=oneline", "-2"], cwd=repo.path, text=True + ) + found = [x.split(" ")[0] for x in out.split("\n") if x] self.assertEqual(commits, list(reversed(found))) def test_pull_rewrite(self): - self._add_commit('foo1', 'commit1', 'commit1') + self._add_commit("foo1", "commit1", "commit1") - repo = gitrepo.Repo(self.tmpdir, 'clone', self.main.path) + repo = gitrepo.Repo(self.tmpdir, "clone", self.main.path) repo._clone() commits = [] - commits.append(self._add_commit('foo3', 'commit3', 'commit3')) + commits.append(self._add_commit("foo3", "commit3", "commit3")) # now add this foo4 to be overwritten - self._add_commit('foo4', 'commit4', 'commit4') + self._add_commit("foo4", "commit4", "commit4") repo.update() subprocess.check_call( - ['git', 'reset', '--hard', 'HEAD^'], cwd=self.main.path) - commits.append(self._add_commit('foo4a', 'commit4a', 'commit4a')) + ["git", "reset", "--hard", "HEAD^"], cwd=self.main.path) + commits.append(self._add_commit("foo4a", "commit4a", "commit4a")) repo.update() out = subprocess.check_output( - ['git', 'log', '--format=oneline', '-2'], cwd=repo.path) - found = [x.split(' ')[0] for x in out.split('\n') if x] + ["git", "log", "--format=oneline", "-2"], cwd=repo.path + ) + found = [x.split(" ")[0] for x in out.decode().split("\n") if x] self.assertEqual(commits, list(reversed(found))) def test_commits_to_check_empty(self): - '''works off an empty repo that's never been analyzed''' + """works off an empty repo that's never been analyzed""" commits = [] - commits.append(self._add_commit('foo', 'foocontent', 'commit1')) - commits.append(self._add_commit('foo', 'foocontent2', 'commit2')) + commits.append(self._add_commit("foo", "foocontent", "commit1")) + commits.append(self._add_commit("foo", "foocontent2", "commit2")) - found = [x.id for x in self.main.process_unchecked_commits()] + found = [x.id.decode() for x in self.main.process_unchecked_commits()] self.assertEqual(commits, found) def test_commits_to_check_previous(self): - '''works off an empty repo that's been analyzed''' - self._add_commit('foo', 'foocontent', 'commit1') + """works off an empty repo that's been analyzed""" + self._add_commit("foo", "foocontent", "commit1") # force last commit file to be updated list(self.main.process_unchecked_commits()) commits = [] - commits.append(self._add_commit('foo', 'foocontent2', 'commit2')) + commits.append(self._add_commit("foo", "foocontent2", "commit2")) - found = [x.id for x in self.main.process_unchecked_commits()] + found = [x.id.decode() for x in self.main.process_unchecked_commits()] self.assertEqual(commits, found) def test_commits_to_check_rewrite(self): - '''can handle a history rewrite''' + """can handle a history rewrite""" commits = [] - commits.append(self._add_commit('foo', 'foocontent', 'commit1')) - commits.append(self._add_commit('foo', 'foocontent2', 'commit2')) + commits.append(self._add_commit("foo", "foocontent", "commit1")) + commits.append(self._add_commit("foo", "foocontent2", "commit2")) - last_commit = os.path.join(self.main.path, 'patchwork-last-commit') - with open(last_commit, 'w') as f: - f.write('11111111111') # invalid sha1, so we'll search back + last_commit = os.path.join(self.main.path, "patchwork-last-commit") + with open(last_commit, "w") as f: + f.write("11111111111") # invalid sha1, so we'll search back - found = [x.id for x in self.main.process_unchecked_commits()] + found = [x.id.decode() for x in self.main.process_unchecked_commits()] self.assertEqual(commits, found) |