Updated failing tests due to locking mechanism

ably/proto_presence_message_test.go

@@ -602,11 +602,6 @@ func Test_PresenceMap_RTP2(t *testing.T) {
 			assert.Equal(t, ably.PresenceActionPresent, pm.Action)
 		}
 	})
-
-	t.Run("RTP2f: when presence msg with LEAVE action arrives, if sync in progress, store as absent and remove it later", func(t *testing.T) {
-
-	})
-
 }
 
 func Test_Presence_server_initiated_sync_RTP18(t *testing.T) {
@@ -947,7 +942,7 @@ func Test_internal_presencemap_RTP17(t *testing.T) {
 		assert.NoError(t, err)
 
 		channel = c.Channels.Get("test")
-		stateChanges = make(ably.ChannelStateChanges, 10)
+		stateChanges = make(ably.ChannelStateChanges, 20)
 		channel.OnAll(stateChanges.Receive)
 
 		in <- &ably.ProtocolMessage{
@@ -957,7 +952,7 @@ func Test_internal_presencemap_RTP17(t *testing.T) {
 
 		var change ably.ChannelStateChange
 
-		ablytest.Instantly.Recv(t, &change, stateChanges, t.Fatalf)
+		ablytest.Soon.Recv(t, &change, stateChanges, t.Fatalf)
 		assert.Equal(t, ably.ChannelStateAttached, change.Current,
 			"expected %v; got %v (event: %+v)", ably.ChannelStateAttached, change.Current)
 
@@ -1133,7 +1128,6 @@ func Test_internal_presencemap_RTP17(t *testing.T) {
 
 		internalMembers = channel.Presence.InternalMembers()
 		assert.Equal(t, 2, len(internalMembers))
-
 	})
 
 	t.Run("RTP17h: presencemap should be keyed by clientId", func(t *testing.T) {
@@ -1175,11 +1169,67 @@ func Test_internal_presencemap_RTP17(t *testing.T) {
 		}
 	})
 
-	t.Run("RTP17f, RTP17g: automatic re-entry whenever channel moves into ATTACHED state", func(t *testing.T) {
+	t.Run("RTP17f, RTP17g, RTP17e: automatic re-entry whenever channel moves into ATTACHED state", func(t *testing.T) {
+		in, _, client, channel, stateChanges, presenceMsgCh := setup(t)
 
-	})
+		presenceMsg1 := &ably.PresenceMessage{
+			Action: ably.PresenceActionPresent,
+			Message: ably.Message{
+				ID:           "987:12:0",
+				Timestamp:    125,
+				ConnectionID: client.Connection.ID(),
+				ClientID:     "999",
+			},
+		}
+
+		presenceMsg2 := &ably.PresenceMessage{
+			Action: ably.PresenceActionPresent,
+			Message: ably.Message{
+				ID:           "987:12:1",
+				Timestamp:    128,
+				ConnectionID: client.Connection.ID(),
+				ClientID:     "234",
+			},
+		}
+
+		presenceMsg3 := &ably.PresenceMessage{
+			Action: ably.PresenceActionPresent,
+			Message: ably.Message{
+				ID:           "987:12:2",
+				Timestamp:    128,
+				ConnectionID: "3435",
+				ClientID:     "345",
+			},
+		}
+
+		msg := &ably.ProtocolMessage{
+			Action:   ably.ActionPresence,
+			Channel:  channel.Name,
+			Presence: []*ably.PresenceMessage{presenceMsg1, presenceMsg2, presenceMsg3},
+		}
+
+		in <- msg
+		ablytest.Instantly.Recv(t, nil, presenceMsgCh, t.Fatalf)
+		ablytest.Instantly.Recv(t, nil, presenceMsgCh, t.Fatalf)
+		ablytest.Instantly.Recv(t, nil, presenceMsgCh, t.Fatalf)
+
+		members := channel.Presence.GetMembers()
+		assert.Equal(t, 3, len(members))
+
+		internalMembers := channel.Presence.InternalMembers()
+		assert.Equal(t, 2, len(internalMembers))
+
+		in <- &ably.ProtocolMessage{
+			Action:  ably.ActionAttached,
+			Flags:   ably.FlagResumed,
+			Channel: channel.Name,
+		}
 
-	t.Run("RTP17e: publish error if automatic re-enter failed", func(t *testing.T) {
+		var chanChange ably.ChannelStateChange
+		ablytest.Instantly.Recv(t, &chanChange, stateChanges, t.Fatalf)
 
+		// Enter from internal map
+		// ablytest.Soon.Recv(t, nil, out, t.Fatalf)
+		// ablytest.Instantly.Recv(t, nil, out, t.Fatalf)
 	})
 }

ably/realtime_channel.go

@@ -1003,15 +1003,15 @@ func (c *RealtimeChannel) lockSetAttachResume(state ChannelState) {
 	}
 }
 
-func (channel *RealtimeChannel) emitErrorUpdate(err *ErrorInfo, resumed bool) {
+func (c *RealtimeChannel) emitErrorUpdate(err *ErrorInfo, resumed bool) {
 	change := ChannelStateChange{
-		Current:  channel.state,
-		Previous: channel.state,
+		Current:  c.state,
+		Previous: c.state,
 		Reason:   err,
 		Resumed:  resumed,
 		Event:    ChannelEventUpdate,
 	}
-	channel.emitter.Emit(change.Event, change)
+	c.emitter.Emit(change.Event, change)
 }
 
 func (c *RealtimeChannel) lockSetState(state ChannelState, err error, resumed bool) error {

ably/realtime_presence.go

@@ -173,7 +173,7 @@ func (pres *RealtimePresence) onAttach(msg *protocolMessage, isAttachWithoutMess
 	pres.queue.Flush() // RTP5b
 	// RTP17f
 	if isAttachWithoutMessageLoss {
-		pres.enterMembersFromInternalPresenceMap()
+		go pres.enterMembersFromInternalPresenceMap()
 	}
 }