imapclient: allow IdleCommand.Wait to be called before Close

Allows users to figure out when the connection has been closed
while idling.

Author: emersion

imapclient/client_test.go

@@ -145,21 +145,6 @@ func TestLogout(t *testing.T) {
 	}
 }
 
-func TestIdle(t *testing.T) {
-	client, server := newClientServerPair(t, imap.ConnStateSelected)
-	defer client.Close()
-	defer server.Close()
-
-	idleCmd, err := client.Idle()
-	if err != nil {
-		t.Fatalf("Idle() = %v", err)
-	}
-	// TODO: test unilateral updates
-	if err := idleCmd.Close(); err != nil {
-		t.Errorf("Close() = %v", err)
-	}
-}
-
 // https://github.com/emersion/go-imap/issues/562
 func TestFetch_invalid(t *testing.T) {
 	client, server := newClientServerPair(t, imap.ConnStateSelected)

imapclient/idle.go

@@ -96,12 +96,7 @@ func (cmd *IdleCommand) Close() error {
 }
 
 // Wait blocks until the IDLE command has completed.
-//
-// Wait can only be called after Close.
 func (cmd *IdleCommand) Wait() error {
-	if !cmd.stopped.Load() {
-		return fmt.Errorf("imapclient: IdleCommand.Close must be called before Wait")
-	}
 	<-cmd.done
 	if cmd.err != nil {
 		return cmd.err

imapclient/idle_test.go

@@ -0,0 +1,42 @@
+package imapclient_test
+
+import (
+	"testing"
+
+	"github.com/emersion/go-imap/v2"
+)
+
+func TestIdle(t *testing.T) {
+	client, server := newClientServerPair(t, imap.ConnStateSelected)
+	defer client.Close()
+	defer server.Close()
+
+	idleCmd, err := client.Idle()
+	if err != nil {
+		t.Fatalf("Idle() = %v", err)
+	}
+	// TODO: test unilateral updates
+	if err := idleCmd.Close(); err != nil {
+		t.Errorf("Close() = %v", err)
+	}
+}
+
+func TestIdle_closedConn(t *testing.T) {
+	client, server := newClientServerPair(t, imap.ConnStateSelected)
+	defer client.Close()
+	defer server.Close()
+
+	idleCmd, err := client.Idle()
+	if err != nil {
+		t.Fatalf("Idle() = %v", err)
+	}
+	defer idleCmd.Close()
+
+	if err := client.Close(); err != nil {
+		t.Fatalf("client.Close() = %v", err)
+	}
+
+	if err := idleCmd.Wait(); err == nil {
+		t.Errorf("IdleCommand.Wait() = nil, want an error")
+	}
+}