From fe4237df3c62bd6dfd1f385893295f93072d0e51 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Mon, 25 Jan 2021 12:39:34 +0100 Subject: entity: readAll and more testing --- bug/bug_actions.go | 3 ++- bug/bug_actions_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'bug') diff --git a/bug/bug_actions.go b/bug/bug_actions.go index 40a2facb..0e240711 100644 --- a/bug/bug_actions.go +++ b/bug/bug_actions.go @@ -4,10 +4,11 @@ import ( "fmt" "strings" + "github.com/pkg/errors" + "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/identity" "github.com/MichaelMure/git-bug/repository" - "github.com/pkg/errors" ) // Fetch retrieve updates from a remote diff --git a/bug/bug_actions_test.go b/bug/bug_actions_test.go index 7a9673d6..fc671063 100644 --- a/bug/bug_actions_test.go +++ b/bug/bug_actions_test.go @@ -12,7 +12,7 @@ import ( ) func TestPushPull(t *testing.T) { - repoA, repoB, remote := repository.SetupReposAndRemote() + repoA, repoB, remote := repository.SetupGoGitReposAndRemote() defer repository.CleanupTestRepos(repoA, repoB, remote) reneA, err := identity.NewIdentity(repoA, "René Descartes", "rene@descartes.fr") @@ -90,7 +90,7 @@ func BenchmarkRebaseTheirs(b *testing.B) { } func _RebaseTheirs(t testing.TB) { - repoA, repoB, remote := repository.SetupReposAndRemote() + repoA, repoB, remote := repository.SetupGoGitReposAndRemote() defer repository.CleanupTestRepos(repoA, repoB, remote) reneA, err := identity.NewIdentity(repoA, "René Descartes", "rene@descartes.fr") @@ -171,7 +171,7 @@ func BenchmarkRebaseOurs(b *testing.B) { } func _RebaseOurs(t testing.TB) { - repoA, repoB, remote := repository.SetupReposAndRemote() + repoA, repoB, remote := repository.SetupGoGitReposAndRemote() defer repository.CleanupTestRepos(repoA, repoB, remote) reneA, err := identity.NewIdentity(repoA, "René Descartes", "rene@descartes.fr") @@ -263,7 +263,7 @@ func BenchmarkRebaseConflict(b *testing.B) { } func _RebaseConflict(t testing.TB) { - repoA, repoB, remote := repository.SetupReposAndRemote() + repoA, repoB, remote := repository.SetupGoGitReposAndRemote() defer repository.CleanupTestRepos(repoA, repoB, remote) reneA, err := identity.NewIdentity(repoA, "René Descartes", "rene@descartes.fr") -- cgit