Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohn.mcdonnell <jmcdonnell@gitlab.com>2022-07-26 06:30:43 +0300
committerjohn.mcdonnell <jmcdonnell@gitlab.com>2022-07-26 08:34:40 +0300
commit6b786a8d7f04074a8f2915474dffc87ed68b64e8 (patch)
tree0d7cae20a499c00990b6b55b77b60d50e6c24167
parent8f2e60f5f87956bbf5da5bf657546f3550215d09 (diff)
Fixing a range of typos in tests
-rw-r--r--internal/git/localrepo/remote_test.go6
-rw-r--r--internal/gitaly/service/commit/tree_entry.go2
-rw-r--r--internal/gitaly/service/hook/pre_receive_test.go2
-rw-r--r--internal/gitaly/service/objectpool/get_test.go4
-rw-r--r--internal/gitaly/service/operations/rebase_test.go2
-rw-r--r--internal/praefect/nodes/tracker/errors_test.go4
6 files changed, 10 insertions, 10 deletions
diff --git a/internal/git/localrepo/remote_test.go b/internal/git/localrepo/remote_test.go
index 24bb0f879..18b2e7ded 100644
--- a/internal/git/localrepo/remote_test.go
+++ b/internal/git/localrepo/remote_test.go
@@ -70,7 +70,7 @@ func TestRepo_FetchRemote(t *testing.T) {
var stderr bytes.Buffer
require.NoError(t, repo.FetchRemote(ctx, "origin", FetchOpts{Stderr: &stderr}))
- require.Empty(t, stderr.String(), "it should not produce output as it is called with --quite flag by default")
+ require.Empty(t, stderr.String(), "it should not produce output as it is called with --quiet flag by default")
refs, err := repo.GetReferences(ctx)
require.NoError(t, err)
@@ -215,7 +215,7 @@ func TestRepo_FetchRemote(t *testing.T) {
}
// captureGitSSHCommand creates a new intercepting command factory which captures the
-// GIT_SSH_COMMAND environment variable. The returned function can be used to read the variables's
+// GIT_SSH_COMMAND environment variable. The returned function can be used to read the variable's
// value.
func captureGitSSHCommand(ctx context.Context, t testing.TB, cfg config.Cfg) (git.CommandFactory, func() ([]byte, error)) {
envPath := filepath.Join(testhelper.TempDir(t), "GIT_SSH_PATH")
@@ -259,7 +259,7 @@ func TestRepo_Push(t *testing.T) {
repoProto, repoPath := gittest.InitRepo(t, cfg, cfg.Storages[0])
repo := New(locator, gitCmdFactory, catfileCache, repoProto)
- // set up master as a divergin ref in push repo
+ // set up master as a diverging ref in push repo
sourceMaster, err := sourceRepo.GetReference(ctx, "refs/heads/master")
require.NoError(t, err)
diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go
index cafd1bed7..4ab6afb3a 100644
--- a/internal/gitaly/service/commit/tree_entry.go
+++ b/internal/gitaly/service/commit/tree_entry.go
@@ -65,7 +65,7 @@ func sendTreeEntry(
if strings.ToLower(treeEntry.Type.String()) != objectInfo.Type {
return helper.ErrInternalf(
- "TreeEntry: mismatched nbject type: tree-oid=%s object-oid=%s entry-type=%s object-type=%s",
+ "TreeEntry: mismatched object type: tree-oid=%s object-oid=%s entry-type=%s object-type=%s",
treeEntry.Oid, objectInfo.Oid, treeEntry.Type.String(), objectInfo.Type,
)
}
diff --git a/internal/gitaly/service/hook/pre_receive_test.go b/internal/gitaly/service/hook/pre_receive_test.go
index a8b8ed6d6..c6171174d 100644
--- a/internal/gitaly/service/hook/pre_receive_test.go
+++ b/internal/gitaly/service/hook/pre_receive_test.go
@@ -224,7 +224,7 @@ func TestPreReceive_APIErrors(t *testing.T) {
expectedStderr: "GitLab: not allowed",
},
{
- desc: "/pre_receive endpoint fails to increase reference coutner",
+ desc: "/pre_receive endpoint fails to increase reference counter",
allowedHandler: allowedHandler(t, true),
preReceiveHandler: preReceiveHandler(t, false),
expectedExitStatus: 1,
diff --git a/internal/gitaly/service/objectpool/get_test.go b/internal/gitaly/service/objectpool/get_test.go
index 138da8070..3fcef9f97 100644
--- a/internal/gitaly/service/objectpool/get_test.go
+++ b/internal/gitaly/service/objectpool/get_test.go
@@ -39,10 +39,10 @@ func TestGetObjectPoolSuccess(t *testing.T) {
func TestGetObjectPoolNoFile(t *testing.T) {
ctx := testhelper.Context(t)
- _, repoo, _, _, client := setup(ctx, t)
+ _, repo, _, _, client := setup(ctx, t)
resp, err := client.GetObjectPool(ctx, &gitalypb.GetObjectPoolRequest{
- Repository: repoo,
+ Repository: repo,
})
require.NoError(t, err)
diff --git a/internal/gitaly/service/operations/rebase_test.go b/internal/gitaly/service/operations/rebase_test.go
index ba371aae7..a63655401 100644
--- a/internal/gitaly/service/operations/rebase_test.go
+++ b/internal/gitaly/service/operations/rebase_test.go
@@ -213,7 +213,7 @@ func TestUserRebaseConfirmable_transaction(t *testing.T) {
expectPreReceiveHook bool
}{
{
- desc: "non-transactonal does not vote but executes hook",
+ desc: "non-transactional does not vote but executes hook",
expectedVotes: 0,
expectPreReceiveHook: true,
},
diff --git a/internal/praefect/nodes/tracker/errors_test.go b/internal/praefect/nodes/tracker/errors_test.go
index d27fdc8a9..81e4a8e3b 100644
--- a/internal/praefect/nodes/tracker/errors_test.go
+++ b/internal/praefect/nodes/tracker/errors_test.go
@@ -104,8 +104,8 @@ func TestErrorTracker_ClearErrors(t *testing.T) {
errors.IncrReadErr(node)
errors.clear()
- assert.Len(t, errors.readErrors[node], 1, "clear should only have cleared the read error older than the time specifiied")
- assert.Len(t, errors.writeErrors[node], 1, "clear should only have cleared the write error older than the time specifiied")
+ assert.Len(t, errors.readErrors[node], 1, "clear should only have cleared the read error older than the time specified")
+ assert.Len(t, errors.writeErrors[node], 1, "clear should only have cleared the write error older than the time specified")
}
func TestErrorTracker_Expired(t *testing.T) {