Browse Source

Merge branch 'feature/connect'

SunRunAway 12 years ago
parent
commit
60f85a4eb0
2 changed files with 18 additions and 1 deletions
  1. 17 0
      client_test.go
  2. 1 1
      ftp.go

+ 17 - 0
client_test.go

@@ -103,3 +103,20 @@ func TestConn(t *testing.T) {
 		t.Error("Expected error")
 		t.Error("Expected error")
 	}
 	}
 }
 }
+
+func TestConn2(t *testing.T) {
+	c, err := Connect("ftp.mozilla.org:21")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = c.Login("anonymous", "anonymous")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = c.List(".")
+	if err != nil {
+		t.Error(err)
+	}
+}

+ 1 - 1
ftp.go

@@ -60,7 +60,7 @@ func Connect(addr string) (*ServerConn, error) {
 		features: make(map[string]string),
 		features: make(map[string]string),
 	}
 	}
 
 
-	_, _, err = c.conn.ReadCodeLine(StatusReady)
+	_, _, err = c.conn.ReadResponse(StatusReady)
 	if err != nil {
 	if err != nil {
 		c.Quit()
 		c.Quit()
 		return nil, err
 		return nil, err