Merge pull request #14628 from ahrtr/withauth_default

test: define a default WithAuth to resolve Unresolved reference error
This commit is contained in:
Benjamin Wang 2022-10-26 18:44:44 +08:00 committed by GitHub
commit 2fcf197e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 4 deletions

View File

@ -21,7 +21,8 @@ import (
"go.etcd.io/etcd/tests/v3/framework/config"
)
var testRunner = framework.UnitTestRunner
var testRunner framework.TestRunner
var clusterTestCases = []testCase{
{
name: "NoTLS",

33
tests/common/unit_test.go Normal file
View File

@ -0,0 +1,33 @@
// Copyright 2022 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//go:build !(e2e || integration)
package common
import (
"go.etcd.io/etcd/tests/v3/framework"
"go.etcd.io/etcd/tests/v3/framework/config"
)
func init() {
testRunner = framework.UnitTestRunner
}
// When a build tag (e.g. e2e or integration) isn't configured in IDE,
// then IDE may complain "Unresolved reference 'WithAuth'". So we need
// to define a default WithAuth to resolve such case.
func WithAuth(userName, password string) config.ClientOption {
return func(any) {}
}

View File

@ -16,7 +16,7 @@ package framework
var (
// UnitTestRunner only runs in `--short` mode, will fail otherwise. Attempts in cluster creation will result in tests being skipped.
UnitTestRunner testRunner = unitRunner{}
UnitTestRunner TestRunner = unitRunner{}
// E2eTestRunner runs etcd and etcdctl binaries in a separate process.
E2eTestRunner = e2eRunner{}
// IntegrationTestRunner runs etcdserver.EtcdServer in separate goroutine and uses client libraries to communicate.

View File

@ -22,7 +22,7 @@ import (
"go.etcd.io/etcd/tests/v3/framework/config"
)
type testRunner interface {
type TestRunner interface {
TestMain(m *testing.M)
BeforeTest(testing.TB)
NewCluster(context.Context, testing.TB, config.ClusterConfig) Cluster

View File

@ -27,7 +27,7 @@ import (
type unitRunner struct{}
var _ testRunner = (*unitRunner)(nil)
var _ TestRunner = (*unitRunner)(nil)
func (e unitRunner) TestMain(m *testing.M) {
flag.Parse()