Fix Flaky Tests (#636)

beacon-chain/blockchain/BUILD.bazel

@@ -20,7 +20,6 @@ go_test(
     name = "go_default_test",
     srcs = ["service_test.go"],
     embed = [":go_default_library"],
-    race = "off",  # TODO(#412): fix issues with tests failing with race on.
     deps = [
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/params:go_default_library",

beacon-chain/casper/BUILD.bazel

@@ -30,7 +30,6 @@ go_test(
         "validator_test.go",
     ],
     embed = [":go_default_library"],
-    race = "off",  # TODO(#434): fix issues with tests failing with race on.
     deps = [
         "//beacon-chain/params:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",

beacon-chain/node/node_test.go

@@ -41,27 +41,6 @@ func TestNodeValidator_Builds(t *testing.T) {
 	}
 }
 
-// Test that beacon chain node can start.
-func TestNodeStart(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	set.String("web3provider", "ws//127.0.0.1:8546", "web3 provider ws or IPC endpoint")
-	tmp := fmt.Sprintf("%s/datadir", os.TempDir())
-	set.String("datadir", tmp, "node data directory")
-	set.Bool("enable-powchain", false, "no powchain service")
-	set.Bool("demo-config", true, "demo configuration")
-
-	context := cli.NewContext(app, set, nil)
-
-	node, err := NewBeaconNode(context)
-	if err != nil {
-		t.Fatalf("Failed to create BeaconNode: %v", err)
-	}
-
-	go node.Start()
-	os.RemoveAll(tmp)
-}
-
 // Test that beacon chain node can close.
 func TestNodeClose(t *testing.T) {
 	hook := logTest.NewGlobal()

beacon-chain/rpc/service_test.go

@@ -225,8 +225,7 @@ func TestLatestAttestationContextClosed(t *testing.T) {
 	testutil.AssertLogsContain(t, hook, "RPC context closed, exiting goroutine")
 }
 
-func TestLatestAttestation(t *testing.T) {
-	hook := logTest.NewGlobal()
+func TestLatestAttestationFaulty(t *testing.T) {
 	attestationService := &mockAttestationService{}
 	rpcService := NewRPCService(context.Background(), &Config{
 		Port:               "8777",
@@ -250,10 +249,25 @@ func TestLatestAttestation(t *testing.T) {
 	}(t)
 
 	rpcService.incomingAttestation <- attestation
+	rpcService.cancel()
+	exitRoutine <- true
+}
 
-	mockStream = internal.NewMockBeaconService_LatestAttestationServer(ctrl)
-	mockStream.EXPECT().Send(attestation.Proto()).Return(nil)
+func TestLatestAttestation(t *testing.T) {
+	hook := logTest.NewGlobal()
+	attestationService := &mockAttestationService{}
+	rpcService := NewRPCService(context.Background(), &Config{
+		Port:               "8777",
+		SubscriptionBuf:    0,
+		AttestationService: attestationService,
+	})
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
 
+	exitRoutine := make(chan bool)
+	attestation := &types.Attestation{}
+	mockStream := internal.NewMockBeaconService_LatestAttestationServer(ctrl)
+	mockStream.EXPECT().Send(attestation.Proto()).Return(nil)
 	// Tests a good stream.
 	go func(tt *testing.T) {
 		if err := rpcService.LatestAttestation(&empty.Empty{}, mockStream); err != nil {
@@ -262,9 +276,10 @@ func TestLatestAttestation(t *testing.T) {
 		<-exitRoutine
 	}(t)
 	rpcService.incomingAttestation <- attestation
-	testutil.AssertLogsContain(t, hook, "Sending attestation to RPC clients")
 	rpcService.cancel()
 	exitRoutine <- true
+
+	testutil.AssertLogsContain(t, hook, "Sending attestation to RPC clients")
 }
 
 func TestValidatorSlotAndResponsibility(t *testing.T) {

beacon-chain/sync/BUILD.bazel

@@ -21,7 +21,6 @@ go_test(
     name = "go_default_test",
     srcs = ["service_test.go"],
     embed = [":go_default_library"],
-    race = "off",  # TODO(#377): fix issues with race detection testing.
     deps = [
         "//beacon-chain/db:go_default_library",
         "//beacon-chain/types:go_default_library",

beacon-chain/sync/service_test.go

@@ -251,7 +251,7 @@ func TestBlockRequestErrors(t *testing.T) {
 
 	go func() {
 		ss.run()
-		exitRoutine <- true
+		<-exitRoutine
 	}()
 
 	malformedRequest := &pb.BeaconBlockHashAnnounce{
@@ -265,7 +265,22 @@ func TestBlockRequestErrors(t *testing.T) {
 	}
 
 	ss.blockRequestBySlot <- invalidmsg
+	ss.cancel()
+	exitRoutine <- true
 	testutil.AssertLogsContain(t, hook, "Received malformed beacon block request p2p message")
+}
+
+func TestBlockRequest(t *testing.T) {
+	hook := logTest.NewGlobal()
+
+	ss := setupService(t)
+
+	exitRoutine := make(chan bool)
+
+	go func() {
+		ss.run()
+		<-exitRoutine
+	}()
 
 	request1 := &pb.BeaconBlockRequestBySlotNumber{
 		SlotNumber: 20,
@@ -278,9 +293,10 @@ func TestBlockRequestErrors(t *testing.T) {
 	}
 
 	ss.blockRequestBySlot <- msg1
-	testutil.AssertLogsDoNotContain(t, hook, "Sending requested block to peer")
-	hook.Reset()
+	ss.cancel()
+	exitRoutine <- true
 
+	testutil.AssertLogsDoNotContain(t, hook, "Sending requested block to peer")
 }
 
 func TestReceiveAttestation(t *testing.T) {

beacon-chain/types/BUILD.bazel

@@ -41,7 +41,6 @@ go_test(
         "crystallized_state_test.go",
     ],
     embed = [":go_default_library"],
-    race = "off",  # TODO(#604): fix issues with tests failing with race on.
     deps = [
         "//beacon-chain/params:go_default_library",
         "//proto/beacon/p2p/v1:go_default_library",

contracts/sharding-manager-contract/BUILD.bazel

@@ -19,7 +19,6 @@ go_test(
     name = "go_default_test",
     srcs = ["sharding_manager_test.go"],
     embed = [":go_default_library"],
-    race = "off",
     tags = ["manual"],
     deps = [
         "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library",