Merge branch 'dev' of github.com:gogits/gogs into dev

1 files changed, 24 insertions, 27 deletions

diff --git a/modules/auth/ldap/ldap_test.go b/modules/auth/ldap/ldap_test.go
index 8096573782..a842eebf9b 100644
--- a/modules/auth/ldap/ldap_test.go
+++ b/modules/auth/ldap/ldap_test.go
@@ -1,32 +1,29 @@
 package ldap
 
-import (
-	"fmt"
-	"testing"
-)
+// import (
+// 	"fmt"
+// 	"testing"
+// )
 
-var ldapServer = "ldap.itd.umich.edu"
-var ldapPort = uint16(389)
-var baseDN = "dc=umich,dc=edu"
-var filter = []string{
-	"(cn=cis-fac)",
-	"(&(objectclass=rfc822mailgroup)(cn=*Computer*))",
-	"(&(objectclass=rfc822mailgroup)(cn=*Mathematics*))"}
-var attributes = []string{
-	"cn",
-	"description"}
-var msadsaformat = ""
+// var ldapServer = "ldap.itd.umich.edu"
+// var ldapPort = 389
+// var baseDN = "dc=umich,dc=edu"
+// var filter = []string{
+// 	"(cn=cis-fac)",
+// 	"(&(objectclass=rfc822mailgroup)(cn=*Computer*))",
+// 	"(&(objectclass=rfc822mailgroup)(cn=*Mathematics*))"}
+// var attributes = []string{
+// 	"cn",
+// 	"description"}
+// var msadsaformat = ""
 
-func TestLDAP(t *testing.T) {
-	AddSource("test", ldapServer, ldapPort,
-		basedn, attributes, filter,
-		msadsaformat)
-	user, err := LoginUserLdap("xiaolunwen", "")
-	if err != nil {
-		t.Error(err)
-		return
-	}
+// func TestLDAP(t *testing.T) {
+// 	AddSource("test", ldapServer, ldapPort, baseDN, attributes, filter, msadsaformat)
+// 	user, err := LoginUserLdap("xiaolunwen", "")
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
 
-	fmt.Println(user)
-
-}
+// 	fmt.Println(user)
+// }