Test expire. Test nick collision. Test delete.

I added some things to the "ircd".  bad as a nick results
in collision.  Sending to missing/#missing reports 401/404
no such nick/channel.

client_test.go

@@ -188,10 +188,14 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 					hasPass = true
 				}
 			case "NICK":
-				expect = fmt.Sprintf("NICK %s", config.Nick)
+				expect = fmt.Sprintf("NICK %s", config.MyNick)
 				if expect != line {
 					t.Errorf("Got %s, Expected %s", line, expect)
 				} else {
+					if config.MyNick == "bad" {
+						// throw bad nick here
+						ircWrite(server, fmt.Sprintf(":irc.red-green.com 433 :Nick already in use."), t)
+					}
 					hasNick = true
 				}
 			case "USER":
@@ -252,10 +256,15 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 		ircWrite(server, fmt.Sprintf(":NickServ MODE %s :+r", config.Nick), t)
 		part2 = true
 	} else {
-		for _, line = range []string{":[email protected] NOTICE %s :This nickname is registered and protected.  If it is your",
-			":[email protected] NOTICE %s :nick, type \x02/msg NickServ IDENTIFY \x1fpassword\x1f\x02.  Otherwise,"} {
-			output = fmt.Sprintf(line, config.Nick)
-			ircWrite(server, output, t)
+		if config.Password != "" {
+			for _, line = range []string{":[email protected] NOTICE %s :This nickname is registered and protected.  If it is your",
+				":[email protected] NOTICE %s :nick, type \x02/msg NickServ IDENTIFY \x1fpassword\x1f\x02.  Otherwise,"} {
+				output = fmt.Sprintf(line, config.Nick)
+				ircWrite(server, output, t)
+			}
+		} else {
+			// No password, so we can't register.  Skip this part.
+			part2 = true
 		}
 	}
 
@@ -323,6 +332,19 @@ func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
 					output = fmt.Sprintf(":%s %s %s :%s", "echo", parts[0], config.MyNick, strings.Join(parts[2:], " "))
 					ircWrite(server, output, t)
 				}
+				if strings.Contains(parts[1], "missing") {
+					// Sending to missing user or channel.
+
+					var number int
+					if strings.Contains(parts[1], "#") {
+						number = 404
+					} else {
+						number = 401
+					}
+
+					output = fmt.Sprintf(":irc.red-green.com %d %s %s :No such nick/channel", number, config.MyNick, parts[1])
+					ircWrite(server, output, t)
+				}
 			}
 		} else {
 			t.Log("Read Error:", err)
@@ -379,6 +401,66 @@ func TestConnect(t *testing.T) {
 	}
 
 }
+
+func TestConnectNickInUse(t *testing.T) {
+	var config IRCConfig = IRCConfig{Nick: "bad",
+		Username:    "test",
+		Realname:    "testing",
+		Flood_Num:   1,
+		Flood_Delay: 20,
+	}
+	var listen net.Listener
+	var address string
+
+	listen, address = setupSocket()
+	var parts []string = strings.Split(address, ":")
+
+	config.Hostname = parts[0]
+	config.Port, _ = strconv.Atoi(parts[1])
+	go ircServer(listen, t, &config)
+	var FromIRC chan IRCMsg
+
+	FromIRC = make(chan IRCMsg)
+	config.ReadChannel = FromIRC
+
+	config.Connect()
+	defer config.Close()
+
+	var Msg IRCMsg
+	var motd, identify bool
+	var missing int
+
+	for Msg = range FromIRC {
+		if Msg.Cmd == "EndMOTD" {
+			t.Log("Got EndMOTD")
+			motd = true
+			config.WriteTo("missing", "PRIVMSG missing :Missing user")
+			config.WriteTo("missing", "PRIVMSG missing :Missing user")
+			config.WriteTo("missing", "PRIVMSG missing :Missing user")
+			config.WriteTo("#missing", "PRIVMSG #missing :Missing channel")
+		}
+		if Msg.Cmd == "Identified" {
+			t.Log("Identified")
+			identify = true
+		}
+		if Msg.Cmd == "404" || Msg.Cmd == "401" {
+			missing++
+		}
+	}
+
+	if !motd {
+		t.Error("Missing EndMOTD")
+	}
+	if identify {
+		t.Error("Should not have been Identified")
+	}
+	if missing < 2 {
+		t.Errorf("Missing should have been 2, was %d", missing)
+	}
+	if config.MyNick == config.Nick {
+		t.Errorf("Nick should be different: Got %s, Didn't Expect %s", config.MyNick, config.Nick)
+	}
+}
 func TestConnectTLS(t *testing.T) {
 	var config IRCConfig = IRCConfig{Nick: "test",
 		Username:       "test",

irc-client.go

@@ -224,6 +224,10 @@ func (Config *IRCConfig) WriterRoutine() {
 				}
 				os.Exit(2)
 
+			case remove := <-Config.DelChannel:
+				log.Printf("Remove: [%s]\n", remove)
+				throttle.delete(remove)
+
 			case output := <-Config.WriteChannel:
 				if output.To == "" {
 					err = Config.write(output.Output)
@@ -437,7 +441,7 @@ func (Config *IRCConfig) ReaderRoutine() {
 				2022/04/06 19:12:11 << :[email protected] NOTICE meow :please choose a different nick.
 			*/
 			if (msg.From == "NickServ") && (msg.Cmd == "NOTICE") {
-				if strings.Contains(msg.Msg, "IDENTIFY") {
+				if strings.Contains(msg.Msg, "IDENTIFY") && Config.Password != "" {
 					Config.PriorityWrite(fmt.Sprintf("NS IDENTIFY %s", Config.Password))
 				}
 				// :[email protected] NOTICE meow :Password accepted - you are now recognized.

throttle_test.go

@@ -7,11 +7,12 @@ import (
 	"os"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestFloodTrack(t *testing.T) {
 	var Flood FloodTrack
-	Flood.Init(3, 2)
+	Flood.Init(3, 1)
 
 	if Flood.Full() {
 		t.Error("Expected Track to be empty")
@@ -34,6 +35,11 @@ func TestFloodTrack(t *testing.T) {
 	if !Flood.Full() {
 		t.Error("Expected Track to be full")
 	}
+	time.Sleep(time.Second)
+	Flood.Expire()
+	if Flood.Pos != 0 {
+		t.Error("Expected Track Pos to be 0")
+	}
 }
 
 func TestThrottleOnly(t *testing.T) {
@@ -120,6 +126,10 @@ func TestThrottleDelete(t *testing.T) {
 	if buff.last != 1 {
 		t.Errorf("Expected last=1, got %d", buff.last)
 	}
+	buff.delete("missing")
+	if buff.last != 1 {
+		t.Errorf("Expected last=1, got %d", buff.last)
+	}
 }
 
 func TestThrottlePopDelete(t *testing.T) {