Merge pull request etcd-io#16889 from tessapham/fix-scripts

fix test script and lint
moficodes · Nov 9, 2023 · 6e30d9e · 6e30d9e
2 parents 38cc9f2 + 2b7e1c6
commit 6e30d9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -652,7 +652,7 @@ function run_pass {
   local pass="${1}"
   shift 1
   log_callout -e "\\n'${pass}' started at $(date)"
-  if "${pass}_pass" "${@}" ; then
+  if "${pass}_pass" "$@" ; then
     log_success "'${pass}' PASSED and completed at $(date)"
     return 0
   else

diff --git a/server/etcdserver/api/v3discovery/discovery_test.go b/server/etcdserver/api/v3discovery/discovery_test.go
@@ -248,8 +248,8 @@ func (fkv *fakeKVForCheckCluster) Get(ctx context.Context, key string, opts ...c
 				},
 			},
 		}, nil
-
-	} else if key == clusterMembersKey {
+	}
+	if key == clusterMembersKey {
 		if fkv.getMembersRetries > 0 {
 			fkv.getMembersRetries--
 			// discovery client should retry on error.
@@ -263,10 +263,9 @@ func (fkv *fakeKVForCheckCluster) Get(ctx context.Context, key string, opts ...c
 			},
 			Kvs: kvs,
 		}, nil
-	} else {
-		fkv.t.Errorf("unexpected key: %s", key)
-		return nil, fmt.Errorf("unexpected key: %s", key)
 	}
+	fkv.t.Errorf("unexpected key: %s", key)
+	return nil, fmt.Errorf("unexpected key: %s", key)
 }
 
 func TestCheckCluster(t *testing.T) {