TEST/MEDIUM: Fix tests for HAProxy 3.3

Backends and frontends cannot share the same name.

The program section has been removed.

Author: oliwer

e2e/tests/binds/add.bats

@@ -60,7 +60,8 @@ load 'utils/_helpers'
 
 @test "binds: Add a new bind for peers" {
   PARENT_NAME="fusion"
-  if haproxy_version_ge "2.5"
+  # segfault in v3.3
+  if haproxy_version_ge "2.5" && !haproxy_version_ge "3.3"
   then
     resource_post "$_PEER_BASE_PATH/$PARENT_NAME/binds" "data/post_2.5.json" "force_reload=true"
     assert_equal "$SC" 201

e2e/tests/http_request_rules/data/haproxy_2.8.cfg

@@ -35,7 +35,7 @@ frontend test_frontend
   http-request del-header X-Del-Frontend if { src 10.1.0.0/16 }
   http-request sc-add-gpc(0,1) 1 if FALSE
 
-frontend test_sticksc
+frontend front_sticksc
   bind *:1248
   default_backend test_sticksc
   http-request track-sc0 src table test_sticksc if TRUE

e2e/tests/http_request_rules/get_2.8.bats

@@ -27,7 +27,7 @@ load 'utils/_helpers'
 @test "http_request_rules: Return one track-sc HTTP Request Rule from frontend" {
   if haproxy_version_ge "2.8"
   then
-  PARENT_NAME="test_sticksc"
+  PARENT_NAME="front_sticksc"
   resource_get "$_FRONTEND_BASE_PATH/$PARENT_NAME/http_request_rules/0"
 	assert_equal "$SC" 200
 	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"

e2e/tests/http_response_rules/data/haproxy_2.8.cfg

@@ -35,7 +35,7 @@ frontend test_frontend
   http-response del-header X-Del-Frontend if { src 10.1.0.0/16 }
   http-response sc-add-gpc(0,1) 1 if FALSE
 
-frontend test_sticksc
+frontend front_sticksc
   bind *:1248
   default_backend test_sticksc
   http-response track-sc0 src table test_sticksc if TRUE

e2e/tests/http_response_rules/get_2.8.bats

@@ -28,7 +28,7 @@ load 'utils/_helpers'
 @test "http_response_rules: Return one track-sc HTTP Response Rule from frontend" {
   if haproxy_version_ge "2.8"
   then
-  PARENT_NAME="test_sticksc"
+  PARENT_NAME="front_sticksc"
   resource_get "$_FRONTEND_BASE_PATH/$PARENT_NAME/http_response_rules/0"
 	assert_equal "$SC" 200
 	assert_equal "$(get_json_path "$BODY" ".type")" "track-sc"

e2e/tests/process_manager/create.bats

@@ -18,12 +18,15 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 load '../../libs/resource_client'
 load '../../libs/version'
 
 load 'utils/_helpers'
 
 @test "process-manager: Create one new program" {
+  if haproxy_version_ge "3.3"; then skip "programs have been removed in haproxy 3.3"; fi
+
   resource_post "$_PROGRAMS_BASE_PATH" "data/program.json" "force_reload=true"
   assert_equal "$SC" 201
 
@@ -35,11 +38,15 @@ load 'utils/_helpers'
 }
 
 @test "process-manager: Fail creating program with same name" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_post "$_PROGRAMS_BASE_PATH" "data/program_duplicated.json" "force_reload=true"
   assert_equal "$SC" 409
 }
 
 @test "process-manager: Fail creating program that isn't valid" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_post "$_PROGRAMS_BASE_PATH" "data/program_invalid.json" "force_reload=true"
   assert_equal "$SC" 422
 }

e2e/tests/process_manager/delete.bats

@@ -18,12 +18,15 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 load '../../libs/resource_client'
 load '../../libs/version'
 
 load 'utils/_helpers'
 
 @test "process-manager: Delete one program by name" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_delete "$_PROGRAMS_BASE_PATH/echo" "force_reload=true"
   assert_equal "$SC" 204
 
@@ -32,6 +35,8 @@ load 'utils/_helpers'
 }
 
 @test "process-manager: Fail deleting app that doesn't exist" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_delete "$_PROGRAMS_BASE_PATH/i_am_not_here" "force_reload=true"
   assert_equal "$SC" 404
 }

e2e/tests/process_manager/get.bats

@@ -18,18 +18,23 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 load '../../libs/resource_client'
 load '../../libs/version'
 
 load 'utils/_helpers'
 
 @test "process-manager: Return one program by name" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_get "$_PROGRAMS_BASE_PATH/echo"
   assert_equal "$SC" 200
   assert_equal "echo" "$(get_json_path "$BODY" ".name")"
 }
 
 @test "process-manager: Fail returning program that doesn't exist" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_get "$_PROGRAMS_BASE_PATH/i_am_not_here"
   assert_equal "$SC" 404
 }

e2e/tests/process_manager/list.bats

@@ -18,12 +18,15 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 load '../../libs/resource_client'
 load '../../libs/version'
 
 load 'utils/_helpers'
 
 @test "process-manager: Return an array of programs" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_get "$_PROGRAMS_BASE_PATH"
   assert_equal "$SC" 200
   assert_equal 1 "$(get_json_path "$BODY" ". | length")"

e2e/tests/process_manager/replace.bats

@@ -18,12 +18,15 @@
 load '../../libs/dataplaneapi'
 load '../../libs/get_json_path'
 load '../../libs/haproxy_config_setup'
+load '../../libs/haproxy_version'
 load '../../libs/resource_client'
 load '../../libs/version'
 
 load 'utils/_helpers'
 
 @test "process-manager: Replace one program" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_put "$_PROGRAMS_BASE_PATH/echo" "data/program_duplicated.json" "force_reload=true"
   assert_equal "$SC" 200
 
@@ -34,6 +37,8 @@ load 'utils/_helpers'
 }
 
 @test "process-manager: Fail replacing program that doesn't exist" {
+  if haproxy_version_ge "3.3"; then skip; fi
+
   resource_put "$_PROGRAMS_BASE_PATH/i_am_not_here" "data/program_duplicated.json" "force_reload=true"
   assert_equal "$SC" 409
 }