remove docker-compose backend, update README.

tempesta-tech · May 6, 2024 · e3236f8 · e3236f8
1 parent c1917c6
commit e3236f8
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 236 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ as root:
 ## Requirements
 
 - Host for testing framework: `python3`, `wrk`, `ab`, `nghttp2`, `h2spec`, 
-`curl`, `h2load`, `tls-perf`, `netstat`, `docker.io`, `nginx`, web content 
+`curl`, `h2load`, `tls-perf`, `netstat`, `lxc`, `nginx`, web content 
 directory accessible by nginx, nginx should not be running before the tests start.
 See Python libraries in `requirements.txt`
 - All hosts except previous one: `sftp-server`

diff --git a/docker_compose/nginx_test/docker-compose.yml b/docker_compose/nginx_test/docker-compose.yml
diff --git a/framework/docker_compose_server.py b/framework/docker_compose_server.py
diff --git a/install-docker.sh b/install-docker.sh
diff --git a/selftests/test_docker_compose_server.py b/selftests/test_docker_compose_server.py
diff --git a/setup.sh b/setup.sh
@@ -54,9 +54,6 @@ make
 make install
 ldconfig
 
-# docker
-./install-docker.sh
-
 # install lxc
 snap install lxd
 lxd init --auto

diff --git a/t_stress/test_wordpress.py b/t_stress/test_wordpress.py
@@ -1,5 +1,5 @@
 """
-HTTP Stress tests with WordPress Docker image.
+HTTP Stress tests with WordPress LXC container.
 """
 
 from framework import tester

diff --git a/tests_disabled.json b/tests_disabled.json
@@ -5,10 +5,6 @@
             "name" : "tcp_connection.test_connection_close.CloseClientConnectiononInvalidReq",
             "reason" : "Invalid request is parsed as two requests. The second response is not supported by current deproxy architecture."
         },
-        {
-            "name" : "selftests.test_docker_compose_server",
-            "reason" : "Docker compose backend does not use in tests now."
-        },
         {
             "name" : "very_many_backends.test_stress_1M.ManyBackends1InGroup",
             "reason" : "Read errors"

diff --git a/tests_priority b/tests_priority
@@ -1,2 +1 @@
 tls
-selftests.test_docker_server