diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-07 01:24:44 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-11-07 01:24:44 +0300 |
| commit | 3a49f34acca5e1db963d9c21dff32a79a064b130 (patch) | |
| tree | e3632802e6d45f5e2a67c0702e49a907def8ae47 /internal/git | |
| parent | 8f7de19a0bb9515baa2b695a5aa1f7bce060854c (diff) | |
Remove some uses of t.Name() as "random" string in tests
Diffstat (limited to 'internal/git')
| -rw-r--r-- | internal/git/objectpool/clone_test.go | 4 | ||||
| -rw-r--r-- | internal/git/objectpool/pool_test.go | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/internal/git/objectpool/clone_test.go b/internal/git/objectpool/clone_test.go index a79b1ac1c..e18940aba 100644 --- a/internal/git/objectpool/clone_test.go +++ b/internal/git/objectpool/clone_test.go @@ -15,7 +15,7 @@ func TestClone(t *testing.T) { testRepo, _, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - pool, err := NewObjectPool(testRepo.GetStorageName(), "@pools"+t.Name()) + pool, err := NewObjectPool(testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) err = pool.clone(ctx, testRepo) @@ -33,7 +33,7 @@ func TestCloneExistingPool(t *testing.T) { testRepo, _, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - pool, err := NewObjectPool(testRepo.GetStorageName(), t.Name()) + pool, err := NewObjectPool(testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) err = pool.clone(ctx, testRepo) diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go index 74d2c1c16..e609f5027 100644 --- a/internal/git/objectpool/pool_test.go +++ b/internal/git/objectpool/pool_test.go @@ -12,11 +12,11 @@ import ( ) func TestNewObjectPool(t *testing.T) { - _, err := NewObjectPool("default", t.Name()) + _, err := NewObjectPool("default", testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) - _, err = NewObjectPool("mepmep", t.Name()) - require.Error(t, err) + _, err = NewObjectPool("mepmep", testhelper.NewTestObjectPoolName(t)) + require.Error(t, err, "creating pool in storage that does not exist should fail") } func TestCreate(t *testing.T) { @@ -28,7 +28,7 @@ func TestCreate(t *testing.T) { masterSha := testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "show-ref", "master") - pool, err := NewObjectPool(testRepo.GetStorageName(), t.Name()) + pool, err := NewObjectPool(testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) err = pool.Create(ctx, testRepo) @@ -61,7 +61,7 @@ func TestCreateSubDirsExist(t *testing.T) { testRepo, _, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - pool, err := NewObjectPool(testRepo.GetStorageName(), t.Name()) + pool, err := NewObjectPool(testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) defer pool.Remove(ctx) require.NoError(t, err) @@ -82,7 +82,7 @@ func TestRemove(t *testing.T) { testRepo, _, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - pool, err := NewObjectPool(testRepo.GetStorageName(), t.Name()) + pool, err := NewObjectPool(testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) err = pool.Create(ctx, testRepo) |