temporary commit

Author: bigbes

connection.go

@@ -1454,15 +1454,12 @@ func isFeatureInSlice(expected iproto.Feature, actualSlice []iproto.Feature) boo
 //
 // Since 1.10.0
 func (conn *Connection) NewWatcher(key string, callback WatchCallback) (Watcher, error) {
-	if conn.c == nil {
-		return nil, ClientError{ErrConnectionNotReady, "client connection is not ready"}
-	}
 	// We need to check the feature because the IPROTO_WATCH request is
 	// asynchronous. We do not expect any response from a Tarantool instance
 	// That's why we can't just check the Tarantool response for an unsupported
 	// request error.
 	if !isFeatureInSlice(iproto.IPROTO_FEATURE_WATCHERS,
-		conn.c.ProtocolInfo().Features) {
+		conn.serverProtocolInfo.Features) {
 		err := fmt.Errorf("the feature %s must be supported by connection "+
 			"to create a watcher", iproto.IPROTO_FEATURE_WATCHERS)
 		return nil, err

tarantool_test.go

@@ -3594,7 +3594,7 @@ func TestNewWatcherDuringReconnectOrAfterClose(t *testing.T) {
 	conn.Close()
 	_, err = conn.NewWatcher("two", func(event WatchEvent) {})
 	assert.NotNil(t, err)
-	assert.ErrorContains(t, err, "client connection is not ready")
+	assert.ErrorContains(t, err, "using closed connection")
 }
 
 func TestConnection_NewWatcher_noWatchersFeature(t *testing.T) {
@@ -4195,13 +4195,13 @@ func runTestMain(m *testing.M) int {
 	startOpts.MemtxUseMvccEngine = !isStreamUnsupported
 
 	inst, err := test_helpers.StartTarantool(startOpts)
-	defer test_helpers.StopTarantoolWithCleanup(inst)
-
 	if err != nil {
 		log.Printf("Failed to prepare test tarantool: %s", err)
 		return 1
 	}
 
+	defer test_helpers.StopTarantoolWithCleanup(inst)
+
 	return m.Run()
 }