refacto tests

Signed-off-by: Victor Vieux <[email protected]>

Author: vieux

.travis.yml

@@ -6,13 +6,13 @@
     include:
       - language: go
         go: 1.8.x
-        env: TESTFILE=unit.sh
+        env: RULE=test-unit
       - language: go
         go: 1.9.x
-        env: TESTFILE=unit.sh
+        env: RULE=test-unit
       - language: go
         go: master
-        env: TESTFILE=unit.sh
+        env: RULE=test-unit
       - language: generic
         sudo: required
         services:
@@ -22,7 +22,7 @@
           - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
           - sudo apt-get update
           - sudo apt-get -y install docker-ce
-        env: TESTFILE=integration.sh
+        env: RULE=test-integration
 
   script:
-    - ./.travis/$TESTFILE
+    - make $RULE

Makefile

@@ -31,3 +31,13 @@ enable:
 push:  clean rootfs create enable
 	@echo "### push plugin ${PLUGIN_NAME}:${PLUGIN_TAG}"
 	@docker plugin push ${PLUGIN_NAME}:${PLUGIN_TAG}
+
+test: test-unit test-integration
+
+test-unit:
+	@echo "### unit tests"
+	./tests/unit.sh
+
+test-integration:
+	@echo "### integration tests"
+	./tests/integration.sh

.travis/integration.sh renamed to tests/integration.sh

@@ -15,7 +15,7 @@ TAG=test
 sudo docker pull rastasheep/ubuntu-sshd
 sudo docker pull busybox
 
-docker build -t sshd .travis/ssh
+docker build -t sshd tests/testdata
 #script
 
 # make the plugin
@@ -60,7 +60,7 @@ sudo docker volume rm sshvolume
 
 # test5: ssh key
 sudo docker plugin disable vieux/sshfs:$TAG
-sudo docker plugin set vieux/sshfs:$TAG sshkey.source=`pwd`/.travis/ssh/
+sudo docker plugin set vieux/sshfs:$TAG sshkey.source=`pwd`/test/testdata/
 sudo docker plugin enable vieux/sshfs:$TAG
 sudo docker volume create -d vieux/sshfs:$TAG -o sshcmd=root@localhost:/ -o port=2222 sshvolume
 sudo docker run --rm -v sshvolume:/write busybox sh -c "echo hello > /write/world"