Merge pull request #1790 from wy65701436/dev

update login test

.travis.yml

@@ -102,7 +102,7 @@ script:
   - docker ps
   - ./tests/notarytest.sh
   - ./tests/startuptest.sh
-  - go run tests/userlogintest.go -name ${HARBOR_ADMIN} -passwd ${HARBOR_ADMIN_PASSWD}
+  - ./tests/userlogintest.sh ${HARBOR_ADMIN} ${HARBOR_ADMIN_PASSWD}
 
 #  - sudo ./tests/testprepare.sh
 #  - go test -v ./tests/apitests

tests/userlogintest.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-func main() {
-	usrNamePtr := flag.String("name", "anaymous", "user name")
-	usrPasswdPtr := flag.String("passwd", "anaymous", "user password")
-	flag.Parse()
-
-	v := url.Values{}
-	v.Set("principal", *usrNamePtr)
-	v.Set("password", *usrPasswdPtr)
-
-	body := ioutil.NopCloser(strings.NewReader(v.Encode())) //endode v:[body struce]
-	fmt.Println(v)
-
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-
-	reqest, err := http.NewRequest("POST", "https://localhost/login", body)
-	if err != nil {
-		fmt.Println("Fatal error ", err.Error())
-	}
-
-	reqest.Header.Set("Content-Type", "application/x-www-form-urlencoded;param=value") //setting post head
-
-	resp, err := client.Do(reqest)
-	defer resp.Body.Close() //close resp.Body
-
-	fmt.Println("login status: ", resp.StatusCode) //print status code
-
-	//content_post, err := ioutil.ReadAll(resp.Body)
-	//if err != nil {
-	//    fmt.Println("Fatal error ", err.Error())
-	//}
-
-	//fmt.Println(string(content_post))    //print reply
-
-	response, err := client.Get("https://localhost/api/logout")
-	if err != nil {
-		fmt.Println("Fatal error ", err.Error())
-	}
-
-	defer response.Body.Close()
-
-	fmt.Println("logout status: ", resp.StatusCode) //print status code
-	//content_get, err := ioutil.ReadAll(response.Body)
-	//fmt.Println(string(content_get))
-
-}

tests/userlogintest.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set +e
+
+STATUS_LOGIN=$(curl --insecure -w '%{http_code}' -d "principal=$1&password=$2" https://localhost/login)
+if [ $STATUS_LOGIN -eq 200 ]; then 
+	echo "Login Harbor success."
+else
+	echo "Login Harbor fail."
+	exit 1
+fi
+
+
+STATUS_LOGOUT=$(curl --insecure -s -o /dev/null -w '%{http_code}' https://localhost/log_out)
+if [ $STATUS_LOGOUT -eq 200 ]; then 
+	echo "Logout Harbor success."
+else
+	echo "Logout Harbor fail."
+	exit 1
+fi