Update TestMain(): do not call os.Exit() explicitly (#8046)

* update workspace

* update testmain

beacon-chain/blockchain/blockchain_test.go

@@ -2,18 +2,14 @@ package blockchain
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/sirupsen/logrus"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		return m.Run()
-	}
-	os.Exit(run())
+	m.Run()
 }

beacon-chain/cache/cache_test.go

@@ -1,17 +1,13 @@
 package cache
 
 import (
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/shared/featureconfig"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{EnableEth1DataVoteCache: true})
-		defer resetCfg()
-		return m.Run()
-	}
-	os.Exit(run())
+	resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{EnableEth1DataVoteCache: true})
+	defer resetCfg()
+	m.Run()
 }

beacon-chain/core/epoch/spectest/spectest_test.go

@@ -1,21 +1,17 @@
 package spectest
 
 import (
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		prevConfig := params.BeaconConfig().Copy()
-		defer params.OverrideBeaconConfig(prevConfig)
-		c := params.BeaconConfig()
-		c.MinGenesisActiveValidatorCount = 16384
-		params.OverrideBeaconConfig(c)
+	prevConfig := params.BeaconConfig().Copy()
+	defer params.OverrideBeaconConfig(prevConfig)
+	c := params.BeaconConfig()
+	c.MinGenesisActiveValidatorCount = 16384
+	params.OverrideBeaconConfig(c)
 
-		return m.Run()
-	}
-	os.Exit(run())
+	m.Run()
 }

beacon-chain/p2p/peers/peers_test.go

@@ -2,7 +2,6 @@ package peers_test
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
@@ -11,24 +10,21 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
-			EnablePeerScorer: true,
-		})
-		defer resetCfg()
+	resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
+		EnablePeerScorer: true,
+	})
+	defer resetCfg()
 
-		resetFlags := flags.Get()
-		flags.Init(&flags.GlobalFlags{
-			BlockBatchLimit:            64,
-			BlockBatchLimitBurstFactor: 10,
-		})
-		defer func() {
-			flags.Init(resetFlags)
-		}()
-		return m.Run()
-	}
-	os.Exit(run())
+	resetFlags := flags.Get()
+	flags.Init(&flags.GlobalFlags{
+		BlockBatchLimit:            64,
+		BlockBatchLimitBurstFactor: 10,
+	})
+	defer func() {
+		flags.Init(resetFlags)
+	}()
+	m.Run()
 }

beacon-chain/p2p/peers/scorers/scorers_test.go

@@ -3,7 +3,6 @@ package scorers_test
 import (
 	"io/ioutil"
 	"math"
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
@@ -13,26 +12,23 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
-			EnablePeerScorer: true,
-		})
-		defer resetCfg()
+	resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
+		EnablePeerScorer: true,
+	})
+	defer resetCfg()
 
-		resetFlags := flags.Get()
-		flags.Init(&flags.GlobalFlags{
-			BlockBatchLimit:            64,
-			BlockBatchLimitBurstFactor: 10,
-		})
-		defer func() {
-			flags.Init(resetFlags)
-		}()
-		return m.Run()
-	}
-	os.Exit(run())
+	resetFlags := flags.Get()
+	flags.Init(&flags.GlobalFlags{
+		BlockBatchLimit:            64,
+		BlockBatchLimitBurstFactor: 10,
+	})
+	defer func() {
+		flags.Init(resetFlags)
+	}()
+	m.Run()
 }
 
 // roundScore returns score rounded in accordance with the score manager's rounding factor.

beacon-chain/powchain/powchain_test.go

@@ -2,18 +2,14 @@ package powchain
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/sirupsen/logrus"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		return m.Run()
-	}
-	os.Exit(run())
+	m.Run()
 }

beacon-chain/rpc/beacon/beacon_test.go

@@ -1,29 +1,25 @@
 package beacon
 
 import (
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
 	"github.com/prysmaticlabs/prysm/shared/params"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		// Use minimal config to reduce test setup time.
-		prevConfig := params.BeaconConfig().Copy()
-		defer params.OverrideBeaconConfig(prevConfig)
-		params.OverrideBeaconConfig(params.MinimalSpecConfig())
+	// Use minimal config to reduce test setup time.
+	prevConfig := params.BeaconConfig().Copy()
+	defer params.OverrideBeaconConfig(prevConfig)
+	params.OverrideBeaconConfig(params.MinimalSpecConfig())
 
-		resetFlags := flags.Get()
-		flags.Init(&flags.GlobalFlags{
-			MinimumSyncPeers: 30,
-		})
-		defer func() {
-			flags.Init(resetFlags)
-		}()
+	resetFlags := flags.Get()
+	flags.Init(&flags.GlobalFlags{
+		MinimumSyncPeers: 30,
+	})
+	defer func() {
+		flags.Init(resetFlags)
+	}()
 
-		return m.Run()
-	}
-	os.Exit(run())
+	m.Run()
 }

beacon-chain/rpc/validator/validator_test.go

@@ -2,23 +2,19 @@ package validator
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/shared/params"
 	"github.com/sirupsen/logrus"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
-		// Use minimal config to reduce test setup time.
-		prevConfig := params.BeaconConfig().Copy()
-		defer params.OverrideBeaconConfig(prevConfig)
-		params.OverrideBeaconConfig(params.MinimalSpecConfig())
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
+	// Use minimal config to reduce test setup time.
+	prevConfig := params.BeaconConfig().Copy()
+	defer params.OverrideBeaconConfig(prevConfig)
+	params.OverrideBeaconConfig(params.MinimalSpecConfig())
 
-		return m.Run()
-	}
-	os.Exit(run())
+	m.Run()
 }

beacon-chain/state/stateutil/stateutil_test.go

@@ -1,17 +1,13 @@
 package stateutil_test
 
 import (
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/shared/featureconfig"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{EnableSSZCache: true})
-		defer resetCfg()
-		return m.Run()
-	}
-	os.Exit(run())
+	resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{EnableSSZCache: true})
+	defer resetCfg()
+	m.Run()
 }

beacon-chain/sync/initial-sync/initial_sync_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"sync"
 	"testing"
 	"time"
@@ -53,27 +52,24 @@ type peerData struct {
 }
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
-
-		resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
-			EnablePeerScorer: true,
-		})
-		defer resetCfg()
-
-		resetFlags := flags.Get()
-		flags.Init(&flags.GlobalFlags{
-			BlockBatchLimit:            64,
-			BlockBatchLimitBurstFactor: 10,
-		})
-		defer func() {
-			flags.Init(resetFlags)
-		}()
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		return m.Run()
-	}
-	os.Exit(run())
+	resetCfg := featureconfig.InitWithReset(&featureconfig.Flags{
+		EnablePeerScorer: true,
+	})
+	defer resetCfg()
+
+	resetFlags := flags.Get()
+	flags.Init(&flags.GlobalFlags{
+		BlockBatchLimit:            64,
+		BlockBatchLimitBurstFactor: 10,
+	})
+	defer func() {
+		flags.Init(resetFlags)
+	}()
+
+	m.Run()
 }
 
 func initializeTestServices(t *testing.T, blocks []uint64, peers []*peerData) (*mock.ChainService, *p2pt.TestP2P, db.Database) {

beacon-chain/sync/sync_test.go

@@ -2,27 +2,23 @@ package sync
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/prysmaticlabs/prysm/beacon-chain/flags"
 	"github.com/sirupsen/logrus"
 )
 
 func TestMain(m *testing.M) {
-	run := func() int {
-		logrus.SetLevel(logrus.DebugLevel)
-		logrus.SetOutput(ioutil.Discard)
+	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetOutput(ioutil.Discard)
 
-		resetFlags := flags.Get()
-		flags.Init(&flags.GlobalFlags{
-			BlockBatchLimit:            64,
-			BlockBatchLimitBurstFactor: 10,
-		})
-		defer func() {
-			flags.Init(resetFlags)
-		}()
-		return m.Run()
-	}
-	os.Exit(run())
+	resetFlags := flags.Get()
+	flags.Init(&flags.GlobalFlags{
+		BlockBatchLimit:            64,
+		BlockBatchLimitBurstFactor: 10,
+	})
+	defer func() {
+		flags.Init(resetFlags)
+	}()
+	m.Run()
 }