tests/pgsql: adjust to new startup message format

With the pgsql improving, we made database an optional parameter (as it
is, according to the documentation). Then the tests had to be updated.

diff --git a/tests/pgsql/pgsql-5000-query-results/test.yaml b/tests/pgsql/pgsql-5000-query-results/test.yaml
index af445d8d0a79042d1a529304832e9a5de9dc43fd..a9eac58f16754ffdf69a60d7644c0d538fe1e4e4 100644 (file)
--- a/tests/pgsql/pgsql-5000-query-results/test.yaml
+++ b/tests/pgsql/pgsql-5000-query-results/test.yaml
@@ -1,6 +1,6 @@
 requires:
 # Pgsql was released on version 7.0
-  min-version: 7.0 
+  min-version: 7.0
 
 args:
 - -k none
@@ -29,9 +29,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 25
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: rules
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: rules
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: rules
       pgsql.response.authentication_md5_password: Z\xdc\xfdf
       pgsql.tx_id: 2
@@ -47,9 +47,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 11
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: rules
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: rules
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: rules
       pgsql.response.authentication_md5_password: "\\xcaT\r'"
       pgsql.tx_id: 2

diff --git a/tests/pgsql/pgsql-pwd-output-disabled/test.yaml b/tests/pgsql/pgsql-pwd-output-disabled/test.yaml
index 1cc162d7f7d4a81e134ce1ca98d0443520255c60..051101383f206bb117e1899afb0313ee87b31820 100644 (file)
--- a/tests/pgsql/pgsql-pwd-output-disabled/test.yaml
+++ b/tests/pgsql/pgsql-pwd-output-disabled/test.yaml
@@ -1,6 +1,6 @@
 requires:
 # Pgsql was released on version 7.0
-  min-version: 7.0 
+  min-version: 7.0
 
 args:
 - -k none
@@ -27,9 +27,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 9
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: Test
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: Test
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: ju-Test
       pgsql.response.message: authentication_cleartext_password
       pgsql.tx_id: 2

diff --git a/tests/pgsql/pgsql-simple-query-rollback/test.yaml b/tests/pgsql/pgsql-simple-query-rollback/test.yaml
index 5fb2c4d3acf8a4a31b6142fb07166d3a49d9aa45..d423a87c776bb22fefe5549c2b034fc9c23b339b 100644 (file)
--- a/tests/pgsql/pgsql-simple-query-rollback/test.yaml
+++ b/tests/pgsql/pgsql-simple-query-rollback/test.yaml
@@ -27,9 +27,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 9
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: Test
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: Test
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: ju-Test
       pgsql.response.message: authentication_sasl
       pgsql.tx_id: 2

diff --git a/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml b/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml
index 644d9c0047ea71e3717772f3bc06e7c919323d8f..6a96de1c0a340cde9466260b42020f76abb0da3f 100644 (file)
--- a/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml
+++ b/tests/pgsql/pgsql-ssl-rejected-md5-auth-simple-query/test.yaml
@@ -1,6 +1,6 @@
 requires:
 # Pgsql was released on version 7.0
-  min-version: 7.0 
+  min-version: 7.0
 
 args:
 - -k none
@@ -29,9 +29,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 11
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: indexer
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: indexer
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: indexer
       pgsql.response.authentication_md5_password: \x88'N5
       pgsql.tx_id: 2
@@ -61,9 +61,9 @@ checks:
       event_type: pgsql
       pcap_cnt: 25
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: indexer
-      pgsql.request.startup_parameters.optional_parameters[0].application_name: psql
-      pgsql.request.startup_parameters.optional_parameters[1].client_encoding: UTF8
+      pgsql.request.startup_parameters.optional_parameters[0].database: indexer
+      pgsql.request.startup_parameters.optional_parameters[1].application_name: psql
+      pgsql.request.startup_parameters.optional_parameters[2].client_encoding: UTF8
       pgsql.request.startup_parameters.user: indexer
       pgsql.response.authentication_md5_password: "\\x9fi\x1A\\x8e"
       pgsql.tx_id: 2

diff --git a/tests/pgsql/pgsql-upgrade-tls/test.yaml b/tests/pgsql/pgsql-upgrade-tls/test.yaml
index 955d13b80907cd831412efe8cb0352ca1f4f8204..b0fd4e20a9f17fcd8897141c82cc9bc3a57eb89c 100644 (file)
--- a/tests/pgsql/pgsql-upgrade-tls/test.yaml
+++ b/tests/pgsql/pgsql-upgrade-tls/test.yaml
@@ -70,9 +70,9 @@ checks:
       src_port: 60359
       event_type: pgsql
       pgsql.request.protocol_version: '3.0'
-      pgsql.request.startup_parameters.database: replication
-      pgsql.request.startup_parameters.optional_parameters[0].replication: 'true'
-      pgsql.request.startup_parameters.optional_parameters[1].application_name: walreceiver
+      pgsql.request.startup_parameters.optional_parameters[0].database: replication
+      pgsql.request.startup_parameters.optional_parameters[1].replication: 'true'
+      pgsql.request.startup_parameters.optional_parameters[2].application_name: walreceiver
       pgsql.request.startup_parameters.user: rep
       pgsql.response.code: '28000'
       pgsql.response.file: auth.c