Merge pull request #5828 from Crypt-iQ/switch_dust_flake_10052021

htlcswitch: remove 5 second timeout for data race unit tests

docs/release-notes/release-notes-0.14.0.md

@@ -436,6 +436,8 @@ messages directly. There is no routing/path finding involved.
 
 * [Fix missing label on sweep transactions](https://github.com/lightningnetwork/lnd/pull/5895).
 
+* [Fixed flake that occurred with the switch dust forwarding test under the data race unit build.](https://github.com/lightningnetwork/lnd/pull/5828)
+
 ## Database
 
 * [Ensure single writer for legacy

htlcswitch/switch_test.go

@@ -3449,16 +3449,11 @@ func TestSwitchDustForwarding(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	select {
+	result, ok := <-carolResultChan
-	case result, ok := <-carolResultChan:
+	require.True(t, ok)
-		require.True(t, ok)
+	assertFailureCode(
-		assertFailureCode(
+		t, result.Error, lnwire.CodeTemporaryChannelFailure,
-			t, result.Error, lnwire.CodeTemporaryChannelFailure,
+	)
-		)
-
-	case <-time.After(5 * time.Second):
-		t.Fatal("no result arrived for carol's dust htlc")
-	}
 
 	// Send an HTLC from Alice to Carol and assert that it is failed at the
 	// call to SendHTLC.