Improve and clean up integration tests, benchmark.

gitor · Dec 19, 2014 · 2090530 · 2090530
1 parent b6cb7dd
commit 2090530
Show file tree

Hide file tree

Showing 37 changed files with 696 additions and 1,863 deletions.
diff --git a/build.sh b/build.sh
@@ -105,7 +105,7 @@ case "${1:-default}" in
 		;;
 
 	docker-init)
-		docker build -q -t syncthing/build:$DOCKERIMGV docker >/dev/null
+		docker build -q -t syncthing/build:$DOCKERIMGV docker
 		;;
 
 	docker-all)
@@ -122,17 +122,15 @@ case "${1:-default}" in
 
 	docker-test)
 		docker run --rm -h syncthing-builder -u $(id -u) -t \
-			-v $(pwd):/tmp/syncthing \
+			-v $(pwd):/go/src/github.com/syncthing/syncthing \
+			-w /go/src/github.com/syncthing/syncthing \
 			syncthing/build:$DOCKERIMGV \
-			sh -euxc 'mkdir -p /go/src/github.com/syncthing \
-				&& cd /go/src/github.com/syncthing \
-				&& cp -r /tmp/syncthing syncthing \
-				&& cd syncthing \
-				&& ./build.sh clean \
+			sh -euxc './build.sh clean \
 				&& go run build.go -race \
 				&& export GOPATH=$(pwd)/Godeps/_workspace:$GOPATH \
 				&& cd test \
-				&& go test -tags integration -v -timeout 60m -short'
+				&& go test -tags integration -v -timeout 60m -short \
+				&& git clean -fxd .'
 		;;
 
 	*)

diff --git a/test/all.sh b/test/all.sh
diff --git a/test/cli_test.go b/test/cli_test.go
@@ -15,7 +15,7 @@
 
 // +build integration
 
-package integration_test
+package integration
 
 import (
 	"os"

diff --git a/test/f1/cert.pem b/test/f1/cert.pem
diff --git a/test/f1/config.xml b/test/f1/config.xml
diff --git a/test/f1/https-cert.pem b/test/f1/https-cert.pem
diff --git a/test/f1/https-key.pem b/test/f1/https-key.pem
diff --git a/test/f1/key.pem b/test/f1/key.pem
diff --git a/test/f2/cert.pem b/test/f2/cert.pem
diff --git a/test/f2/config.xml b/test/f2/config.xml
diff --git a/test/f2/https-cert.pem b/test/f2/https-cert.pem
diff --git a/test/f2/https-key.pem b/test/f2/https-key.pem
diff --git a/test/f2/key.pem b/test/f2/key.pem