From 1d4667c825bb5d291070bd4463c39a16f950f674 Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Thu, 16 Jun 2022 09:02:52 -0400 Subject: refactor(809): eliminate need to defer CleanupTestRepos() --- identity/identity_actions_test.go | 3 +-- identity/identity_test.go | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'identity') diff --git a/identity/identity_actions_test.go b/identity/identity_actions_test.go index 2a5954d6..351fb7a4 100644 --- a/identity/identity_actions_test.go +++ b/identity/identity_actions_test.go @@ -9,8 +9,7 @@ import ( ) func TestIdentityPushPull(t *testing.T) { - repoA, repoB, remote := repository.SetupGoGitReposAndRemote() - defer repository.CleanupTestRepos(repoA, repoB, remote) + repoA, repoB, _ := repository.SetupGoGitReposAndRemote(t) identity1, err := NewIdentity(repoA, "name1", "email1") require.NoError(t, err) diff --git a/identity/identity_test.go b/identity/identity_test.go index 2cdb4b36..f0c3bbe9 100644 --- a/identity/identity_test.go +++ b/identity/identity_test.go @@ -245,10 +245,9 @@ func TestJSON(t *testing.T) { } func TestIdentityRemove(t *testing.T) { - repo := repository.CreateGoGitTestRepo(false) - remoteA := repository.CreateGoGitTestRepo(true) - remoteB := repository.CreateGoGitTestRepo(true) - defer repository.CleanupTestRepos(repo, remoteA, remoteB) + repo := repository.CreateGoGitTestRepo(t, false) + remoteA := repository.CreateGoGitTestRepo(t, true) + remoteB := repository.CreateGoGitTestRepo(t, true) err := repo.AddRemote("remoteA", remoteA.GetLocalRemote()) require.NoError(t, err) -- cgit