X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon_test.go;h=d049e42be2f38abe06aad2806b85ed659adddb22;hb=b35f6e7b3c510bea24c0927073720a459055816e;hp=1c86f351d819816682b095d063d5f98116471d35;hpb=59a6cddf54c13b63990d2c1bdc708d6b9ddb5b5f;p=goircd.git

diff --git a/daemon_test.go b/daemon_test.go
index 1c86f35..d049e42 100644
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func TestRegistrationWorkflow(t *testing.T) {
-	daemon := NewDaemon("foohost", "", nil, nil)
+	daemon := NewDaemon("ver1", "foohost", "", nil, nil)
 	events := make(chan ClientEvent)
 	go daemon.Processor(events)
 	conn := NewTestingConn()
@@ -113,14 +113,14 @@ func TestRegistrationWorkflow(t *testing.T) {
 func TestMotd(t *testing.T) {
 	fd, err := ioutil.TempFile("", "motd")
 	if err != nil {
-		t.Fatal("can not create temporary file")
+		t.Fatalf("can not create temporary file: %v", err)
 	}
 	defer os.Remove(fd.Name())
-	fd.Write([]byte("catched\n"))
+	fd.WriteString("catched\n")
 
 	conn := NewTestingConn()
 	client := NewClient("foohost", conn)
-	daemon := NewDaemon("foohost", fd.Name(), nil, nil)
+	daemon := NewDaemon("ver1", "foohost", fd.Name(), nil, nil)
 
 	daemon.SendMotd(client)
 	if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 375") {
@@ -129,7 +129,7 @@ func TestMotd(t *testing.T) {
 	if r := <-conn.outbound; !strings.Contains(r, "372 * :- catched\r\n") {
 		t.Fatal("MOTD contents", r)
 	}
-	if r := <-conn.outbound; !strings.HasPrefix(r, ":foohost 376") {
-		t.Fatal("MOTD end", r)
+	if got, want := <-conn.outbound, ":foohost 376"; !strings.HasPrefix(got, want) {
+		t.Fatalf("MOTD end: got %q, want prefix %q", got, want)
 	}
 }