TEST/MEDIUM: haproxy.cfg: fix test fixtures to pass reloads

Author: mjuraga

e2e/tests/backend_switching_rules/data/haproxy.cfg

@@ -45,4 +45,4 @@ backend second_backend
 backend test_backend
   mode http
   balance roundrobin
-  option forwardfor
+  option forwardfor

e2e/tests/binds/data/haproxy.cfg

@@ -28,6 +28,6 @@ defaults
 frontend test_frontend
   mode tcp
   maxconn 1000
-  bind 192.168.1.1:80 name fixture
-  bind 192.168.2.2:8080 name loopback
-  option httpclose
+  bind localhost:9000 name fixture
+  bind localhost:9090 name loopback
+  option httpclose

e2e/tests/binds/data/post.json

@@ -1,7 +1,7 @@
 {
   "address": "127.0.0.1",
   "name": "test_bind",
-  "port": 80,
+  "port": 10000,
   "defer_accept": true,
   "allow_0rtt": true
 }

e2e/tests/binds/data/put.json

@@ -2,5 +2,5 @@
   "level": "user",
   "name": "fixture",
   "address": "127.0.0.1",
-  "port": 8080
+  "port": 10001
 }

e2e/tests/global/data/put.json

@@ -1,18 +1,12 @@
 {
-    "cpu_maps": null,
     "runtime_apis": [
       {
-        "address": "/var/run/haproxy/admin.sock",
-        "level": "admin",
-        "mode": "660",
-				"allow_0rtt": true,
-        "name": "runtime_api_1"
+        "address": "/var/lib/haproxy/stats",
+        "level": "admin"
       }
     ],
     "daemon": "enabled",
-    "lua_loads": null,
-    "lua_prepend_path": null,
     "master-worker": true,
     "maxconn": 5000,
-    "pidfile": "/var/run/haproxy/haproxy.pid"
+    "pidfile": "/var/run/haproxy.pid"
   }

e2e/tests/global/replace.bats

@@ -31,10 +31,7 @@ load 'utils/_helpers'
 	assert_equal "$SC" 200
 	assert_equal "$(get_json_path "$BODY" '.data.maxconn')" "5000"
 	assert_equal "$(get_json_path "$BODY" '.data.daemon')" "enabled"
-	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy/haproxy.pid"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/run/haproxy/admin.sock"
+	assert_equal "$(get_json_path "$BODY" '.data.pidfile')" "/var/run/haproxy.pid"
+	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].address')" "/var/lib/haproxy/stats"
 	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].level')" "admin"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].mode')" "660"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].allow_0rtt')" "true"
-	assert_equal "$(get_json_path "$BODY" '.data.runtime_apis[0].name')" "runtime_api_1"
 }

e2e/tests/process_manager/create.bats

@@ -27,9 +27,9 @@ load 'utils/_helpers'
   resource_post "$_PROGRAMS_BASE_PATH" "data/program.json" "force_reload=true"
   assert_equal "$SC" 201
 
-  resource_get "$_PROGRAMS_BASE_PATH/mirror"
+  resource_get "$_PROGRAMS_BASE_PATH/test"
   assert_equal "$SC" 200
-  assert_equal "mirror" "$(get_json_path "$BODY" ".data.name")"
+  assert_equal "test" "$(get_json_path "$BODY" ".data.name")"
   assert_equal "nobody" "$(get_json_path "$BODY" ".data.user")"
   assert_equal "nobody" "$(get_json_path "$BODY" ".data.group")"
 }

e2e/tests/process_manager/data/haproxy.cfg

@@ -29,7 +29,3 @@ defaults
 
 program echo
    command echo "Hello, World!"
-
-program dataplaneapi
-   command /usr/local/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /opt/hapee-2.5/sbin/hapee-lb  --config-file /etc/hapee-2.5/hapee-lb.cfg --reload-cmd "systemctl reload hapee-2.5" --reload-delay 5 --userlist haproxy-dataplaneapi
-   no option start-on-reload

e2e/tests/process_manager/data/program.json

@@ -1,6 +1,7 @@
 {
-  "name": "mirror",
-  "command": "spoa-mirror --runtime 0 --mirror-url http://test.local",
+  "name": "test",
+  "command": "echo true",
+  "start-on-reload": "disabled",
   "user": "nobody",
   "group": "nobody"
 }

e2e/tests/process_manager/data/program_duplicated.json

@@ -1,7 +1,4 @@
 {
-  "name": "dataplaneapi",
-  "command": "/usr/local/bin/dataplaneapi -f /path/to/file.cfg",
-  "start-on-reload": "disabled",
-  "user": "nobody",
-  "group": "nobody"
+  "name": "echo",
+  "command": "echo \"Hello Universe\""
 }