From 88c46704358f2e3fce1da2196e8ec2451f5fb725 Mon Sep 17 00:00:00 2001 From: Qi Zheng Date: Wed, 24 Jul 2019 00:18:32 +0000 Subject: [PATCH] Add test cases to travis task Signed-off-by: Qi Zheng --- .travis.yml | 2 ++ tests/memcached/memcached.bats | 4 ++-- tests/nginx/nginx.bats | 4 ++-- tests/redis/redis.bats | 10 +++++----- tests/utils.bash | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2b6778..62e42b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,3 +36,5 @@ env: script: - cd $DOCKERFILE_DIR - docker build -t clearlinux/$DOCKERFILE_DIR . + - cd .. + - if [ -d "./tests/$DOCKERFILE_DIR" ]; then cd tests; make $DOCKERFILE_DIR; fi diff --git a/tests/memcached/memcached.bats b/tests/memcached/memcached.bats index b0f1e26..91ae8c0 100755 --- a/tests/memcached/memcached.bats +++ b/tests/memcached/memcached.bats @@ -6,7 +6,7 @@ load ../utils @test "Start memcached server" { - sudo docker run --name memcached-server --rm -d clearlinux/memcached + docker run --name memcached-server --rm -d clearlinux/memcached sleep 5 run check_container_status memcached-server [ "$status" -eq 0 ] @@ -23,7 +23,7 @@ load ../utils @test "Stop memcached server" { - sudo docker stop memcached-server + docker stop memcached-server sleep 3 run check_container_status memcached-server [ "$status" -eq 1 ] diff --git a/tests/nginx/nginx.bats b/tests/nginx/nginx.bats index 4a03a24..00bbfdf 100755 --- a/tests/nginx/nginx.bats +++ b/tests/nginx/nginx.bats @@ -6,7 +6,7 @@ load ../utils @test "Start nginx server" { - sudo docker run --name nginx-server --rm -d -p 8080:80 clearlinux/nginx + docker run --name nginx-server --rm -d -p 8080:80 clearlinux/nginx sleep 5 run check_container_status nginx-server [ "$status" -eq 0 ] @@ -17,7 +17,7 @@ load ../utils } @test "Stop nginx server" { - sudo docker stop nginx-server + docker stop nginx-server sleep 3 run check_container_status nginx-server [ "$status" -eq 1 ] diff --git a/tests/redis/redis.bats b/tests/redis/redis.bats index 9e979e8..922438f 100755 --- a/tests/redis/redis.bats +++ b/tests/redis/redis.bats @@ -5,7 +5,7 @@ load ../utils @test "Start redis server" { - sudo docker run --name redis-server --rm -d clearlinux/redis redis-server --protected-mode no + docker run --name redis-server --rm -d clearlinux/redis redis-server --protected-mode no sleep 5 run check_container_status redis-server [ "$status" -eq 0 ] @@ -18,8 +18,8 @@ load ../utils ipaddr="$output" # push two integers - sudo docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist x - sudo docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist y + docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist x + docker run --rm clearlinux/redis redis-cli -h $ipaddr lpush mylist y } @test "Redis LRANGE test" { @@ -29,12 +29,12 @@ load ../utils ipaddr="$output" # push two integers - sudo docker run --rm clearlinux/redis redis-cli -h $ipaddr lrange mylist 0 -1 + docker run --rm clearlinux/redis redis-cli -h $ipaddr lrange mylist 0 -1 } @test "Stop redis server" { - sudo docker stop redis-server + docker stop redis-server sleep 3 run check_container_status redis-server [ "$status" -eq 1 ] diff --git a/tests/utils.bash b/tests/utils.bash index 7e84a20..bb477ee 100644 --- a/tests/utils.bash +++ b/tests/utils.bash @@ -23,9 +23,9 @@ check_os() { # otherwise, check the container name as the parameter check_container_status() { if [ -n $1 ]; then - sudo docker ps | grep $1 | grep Up + docker ps | grep $1 | grep Up else - sudo docker ps -l | grep Up + docker ps -l | grep Up fi }