Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13807 from endocrimes/dani/before-test-fix

Browse Source 
tests/framework/integration: Fail BeforeTest nesting early
This commit is contained in:
Marek Siarkowicz 2022-04-07 15:37:06 +02:00 committed by GitHub
commit a5b9f72da6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/framework/integration/testing.go
View File

@ -72,6 +72,10 @@ func BeforeTest(t testutil.TB, opts ...TestOption) {
t.Helper() t.Helper()
options := newTestOptions(opts...) options := newTestOptions(opts...)
if insideTestContext {
t.Fatal("already in test context. BeforeTest was likely already called")
}
if options.skipInShort { if options.skipInShort {
testutil.SkipTestIfShortMode(t, "Cannot create clusters in --short tests") testutil.SkipTestIfShortMode(t, "Cannot create clusters in --short tests")
} }
@ -93,10 +97,6 @@ func BeforeTest(t testutil.TB, opts ...TestOption) {
os.Chdir(previousWD) os.Chdir(previousWD)
}) })
if insideTestContext {
t.Fatal("already in test context. BeforeTest was likely already called")
}
grpc_logger.Set(zapgrpc.NewLogger(zaptest.NewLogger(t).Named("grpc"))) grpc_logger.Set(zapgrpc.NewLogger(zaptest.NewLogger(t).Named("grpc")))
insideTestContext = true insideTestContext = true