From c49cf186772c499c47f10fc1a5f39701c65fca42 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara-Reid <oharareid.ryan@gmail.com>
Date: Mon, 25 Mar 2019 16:16:19 +1100
Subject: [PATCH] OKEX websocket: Fix test race condition (#258)

---
 exchanges/okcoin/okcoin_test.go | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/exchanges/okcoin/okcoin_test.go b/exchanges/okcoin/okcoin_test.go
index e35c8fc3..3b75d762 100644
--- a/exchanges/okcoin/okcoin_test.go
+++ b/exchanges/okcoin/okcoin_test.go
@@ -21,7 +21,7 @@ const (
 	canManipulateRealOrders = false
 )
 
-var o = OKCoin{}
+var o OKCoin
 var testSetupRan bool
 var spotCurrency = currency.NewPairWithDelimiter(currency.BTC.String(), currency.USD.String(), "-").Lower().String()
 
@@ -34,18 +34,6 @@ func TestSetDefaults(t *testing.T) {
 		t.Errorf("Test Failed - %v - SetDefaults() error", OKGroupExchange)
 	}
 	TestSetup(t)
-	t.Parallel()
-}
-
-// TestSetWsDefaults Sets websocket defaults
-func TestSetWsDefaults(t *testing.T) {
-	if o.Name != OKGroupExchange {
-		o.SetDefaults()
-	}
-	if o.GetName() != OKGroupExchange {
-		t.Errorf("Test Failed - %v - SetDefaults() error", OKGroupExchange)
-	}
-	TestSetup(t)
 }
 
 // TestSetRealOrderDefaults Sets test defaults when test can impact real money/orders
@@ -852,10 +840,8 @@ func TestWsLogin(t *testing.T) {
 
 // TestSubscribeToChannel API endpoint test
 func TestSubscribeToChannel(t *testing.T) {
-	defer disconnectFromWS()
-	TestSetWsDefaults(t)
+	TestSetDefaults(t)
 	if o.WebsocketConn == nil {
-		o.Websocket.Shutdown()
 		err := setupWSConnection()
 		if err != nil {
 			t.Error(err)
@@ -864,6 +850,7 @@ func TestSubscribeToChannel(t *testing.T) {
 	if !o.Websocket.IsConnected() {
 		t.Skip()
 	}
+	defer disconnectFromWS()
 	channelName := "spot/depth:LTC-BTC"
 	err := o.WsSubscribeToChannel(channelName)
 	if err != nil {
@@ -890,7 +877,7 @@ func TestSubscribeToChannel(t *testing.T) {
 // Then captures the error response
 func TestSubscribeToNonExistantChannel(t *testing.T) {
 	defer disconnectFromWS()
-	TestSetWsDefaults(t)
+	TestSetDefaults(t)
 	if o.WebsocketConn == nil {
 		o.Websocket.Shutdown()
 		err := setupWSConnection()