zmq4: skp ipc-crouter-cdealer

go-zeromq · Jun 17, 2022 · ceebe76 · ceebe76
1 parent c33556f
commit ceebe76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/czmq4_test.go b/czmq4_test.go
@@ -316,6 +316,7 @@ var (
 		},
 		{
 			name:     "ipc-crouter-cdealer",
+			skip:     true,
 			endpoint: func() string { return "ipc://crouter-cdealer" },
 			router: func(ctx context.Context) zmq4.Socket {
 				return zmq4.NewCRouter(ctx, zmq4.CWithID(zmq4.SocketIdentity("router")))

diff --git a/socket_test.go b/socket_test.go
@@ -285,28 +285,20 @@ func (t *transportMock) Addr(ep string) (addr string, err error) {
 	return "", nil
 }
 
-func (t *transportMock) init() {
-	t.dialCalledCount = 0
-	t.errOnDial = false
-	t.conn = nil
-	zmq4.RegisterTransport("test", testTransport)
-}
-
-var testTransport = &transportMock{}
-
 func TestConnMaxRetries(t *testing.T) {
 	retryCount := 123
 	socket := zmq4.NewSub(context.Background(), zmq4.WithDialerRetry(time.Microsecond), zmq4.WithDialerMaxRetries(retryCount))
-	testTransport.init()
-	testTransport.errOnDial = true
-	err := socket.Dial("test://test")
+	transport := &transportMock{errOnDial: true}
+	transportName := "test-maxretries"
+	zmq4.RegisterTransport(transportName, transport)
+	err := socket.Dial(transportName + "://test")
 
 	if err == nil {
 		t.Fatal("expected error")
 	}
 
-	if testTransport.dialCalledCount != retryCount+1 {
-		t.Fatalf("Dial called %d times, expected %d", testTransport.dialCalledCount, retryCount+1)
+	if transport.dialCalledCount != retryCount+1 {
+		t.Fatalf("Dial called %d times, expected %d", transport.dialCalledCount, retryCount+1)
 	}
 }
 
@@ -317,17 +309,16 @@ func TestConnMaxRetriesInfinite(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	socket := zmq4.NewSub(ctx, zmq4.WithDialerRetry(retryTime), zmq4.WithDialerMaxRetries(-1))
-	testTransport.init()
-	testTransport.errOnDial = true
-
-	err := socket.Dial("test://test")
-
+	transport := &transportMock{errOnDial: true}
+	transportName := "test-infiniteretries"
+	zmq4.RegisterTransport(transportName, transport)
+	err := socket.Dial(transportName + "://test")
 	if err == nil {
 		t.Fatal("expected error")
 	}
 
 	atLeastExpectedRetries := 100
-	if testTransport.dialCalledCount < atLeastExpectedRetries {
-		t.Fatalf("Dial called %d times, expected  at least %d", testTransport.dialCalledCount, atLeastExpectedRetries)
+	if transport.dialCalledCount < atLeastExpectedRetries {
+		t.Fatalf("Dial called %d times, expected  at least %d", transport.dialCalledCount, atLeastExpectedRetries)
 	}
 }