This fixes race condition in testing. Fixes #1.

client_test.go

@@ -392,7 +392,7 @@ func TestConnectSignal(t *testing.T) {
 	config.ReadChannel = FromIRC
 
 	config.Connect()
-	defer config.Close()
+	// defer config.Close()
 
 	var Msg IRCMsg
 	var motd, identify bool
@@ -420,6 +420,9 @@ func TestConnectSignal(t *testing.T) {
 	if !identify {
 		t.Error("Missing Identified")
 	}
+
+	config.Close()
+
 	if !exit {
 		t.Error("AtExit wasn't called.")
 	}

irc-client.go

@@ -72,6 +72,19 @@ type IRCConfig struct {
 	Registered     bool
 	ISupport       map[string]string // 005
 	wg             sync.WaitGroup
+	Mutex          sync.Mutex
+}
+
+func (Config *IRCConfig) GetNick() string {
+	Config.Mutex.Lock()
+	defer Config.Mutex.Unlock()
+	return Config.MyNick
+}
+
+func (Config *IRCConfig) SetNick(nick string) {
+	Config.Mutex.Lock()
+	defer Config.Mutex.Unlock()
+	Config.MyNick = nick
 }
 
 // Writer       *bufio.Writer
@@ -217,9 +230,12 @@ func (Config *IRCConfig) WriterRoutine() {
 				if !gotSignal {
 					gotSignal = true
 					log.Println("SIGNAL")
-					if Config.OnExit != nil {
-						Config.OnExit()
-					}
+					/*
+						// This should be handled now by Close().
+						if Config.OnExit != nil {
+							Config.OnExit()
+						}
+					*/
 					Config.PriorityWrite("QUIT :Received SIGINT")
 				}
 				// return
@@ -254,9 +270,12 @@ func (Config *IRCConfig) WriterRoutine() {
 				if !gotSignal {
 					gotSignal = true
 					log.Println("SIGNAL")
-					if Config.OnExit != nil {
-						Config.OnExit()
-					}
+					/*
+						// This should now be handled by Close().
+						if Config.OnExit != nil {
+							Config.OnExit()
+						}
+					*/
 					Config.PriorityWrite("QUIT :Received SIGINT")
 				}
 				// return
@@ -301,6 +320,9 @@ func (Config *IRCConfig) WriterRoutine() {
 func (Config *IRCConfig) Close() {
 	Config.Socket.Close()
 	Config.PriorityWrite("")
+	if Config.OnExit != nil {
+		Config.OnExit()
+	}
 	Config.wg.Wait()
 }
 
@@ -580,7 +602,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 			// :meow NICK :meow-bot
 
 			if msg.From == Config.MyNick {
-				Config.MyNick = msg.To
+				Config.SetNick(msg.To)
 				log.Println("Nick is now:", Config.MyNick)
 			}
 		}

ircd_test.go

@@ -373,7 +373,7 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 						number = 401
 					}
 
-					output = fmt.Sprintf(":irc.red-green.com %d %s %s :No such nick/channel", number, config.MyNick, parts[1])
+					output = fmt.Sprintf(":irc.red-green.com %d %s %s :No such nick/channel", number, config.GetNick(), parts[1])
 					ircWrite(server, output, t)
 				}
 			case "NICK":