Merge pull request #322 from yhua123/master

update .travis and go lib dir
This commit is contained in:
Daniel Jiang
2016-06-07 16:11:45 +08:00
3 changed files with 2 additions and 10 deletions
-8
View File
@@ -48,7 +48,6 @@ install:
- sudo mv docker-compose /usr/local/bin
- go get github.com/dghubble/sling
- go get github.com/stretchr/testify
- go get github.com/yhua123/harbor/tests/apitests/apilib
before_script:
# create tables and load data
@@ -62,16 +61,9 @@ script:
- docker-compose -f Deploy/docker-compose.yml up -d
- docker ps
- docker version
- docker-compose version
- go run tests/startuptest.go http://localhost/
- go run tests/userlogintest.go -name ${HARBOR_ADMIN} -passwd ${HARBOR_ADMIN_PASSWD}
# test for API
- #IP=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print $1}'`
- #echo $IP
- #docker login -u admin -p Harbor12345 $IP
- #./tests/testprepare.sh
- docker ps
- go test -v ./tests/apitests
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/stretchr/testify/assert"
"testing"
"github.com/yhua123/harbor/tests/apitests/apilib"
"github.com/vmware/harbor/tests/apitests/apilib"
)
func TestAddProject(t *testing.T) {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/stretchr/testify/assert"
"testing"
"github.com/yhua123/harbor/tests/apitests/apilib"
"github.com/vmware/harbor/tests/apitests/apilib"
)
func TestSearch(t *testing.T) {