Skip to contentSkip to conversation

Change in openvpn[master]: t_server_null: match test numbers with server numbers

Openvpn-devel In review mattock (Code Review) 2 participants 6 messages Jul 15, 2025 – Jul 16, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1752565606000.I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75@...2715...

#1 lore raw

Attention is currently required from: flichtenheld, plaisthos.

Hello plaisthos, flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email

to review the following change.

Change subject: t_server_null: match test numbers with server numbers
......................................................................

t_server_null: match test numbers with server numbers

This makes it obvious which server each test connects to

Change-Id I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75

---
M tests/t_server_null_default.rc

1 file changed, 42 insertions(+), 42 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/1086/1

tests/t_server_null_default.rc +42 -42
index a1c68cd..900f189 100755
@@ -80,67 +80,67 @@
 CLIENT_CIPHER_OPTS=""
 CLIENT_CERT_OPTS="--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"
 
-TEST_RUN_LIST="1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
+TEST_RUN_LIST="1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c"
 CLIENT_CONF_BASE="${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 CLIENT_CONF_BASE_LWIP="${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 
-TEST_NAME_1="t_server_null_client.sh-openvpn_current_udp"
-SHOULD_PASS_1="yes"
-CLIENT_EXEC_1="${CLIENT_EXEC}"
-CLIENT_CONF_1="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+TEST_NAME_1a="t_server_null_client.sh-openvpn_current_udp"
+SHOULD_PASS_1a="yes"
+CLIENT_EXEC_1a="${CLIENT_EXEC}"
+CLIENT_CONF_1a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+
+TEST_NAME_1b="t_server_null_client.sh-openvpn_current_udp_fail"
+SHOULD_PASS_1b="no"
+CLIENT_EXEC_1b="${CLIENT_EXEC}"
+CLIENT_CONF_1b="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
+
+# --data-cipher list against server with defaults
+# --cipher ignored
+TEST_NAME_1c="t_server_null_client.sh-openvpn_current_udp_dc1"
+SHOULD_PASS_1c="yes"
+CLIENT_EXEC_1c="${CLIENT_EXEC}"
+CLIENT_CONF_1c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
 
 TEST_NAME_1L="t_server_null_client.sh-openvpn_current_udp_lwip"
 SHOULD_PASS_1L="yes"
 CLIENT_EXEC_1L="${CLIENT_EXEC}"
 CLIENT_CONF_1L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp"
 
-TEST_NAME_2="t_server_null_client.sh-openvpn_current_tcp"
-SHOULD_PASS_2="yes"
-CLIENT_EXEC_2="${CLIENT_EXEC}"
-CLIENT_CONF_2="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
+TEST_NAME_2a="t_server_null_client.sh-openvpn_current_tcp"
+SHOULD_PASS_2a="yes"
+CLIENT_EXEC_2a="${CLIENT_EXEC}"
+CLIENT_CONF_2a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
 
 TEST_NAME_2L="t_server_null_client.sh-openvpn_current_tcp_lwip"
 SHOULD_PASS_2L="yes"
 CLIENT_EXEC_2L="${CLIENT_EXEC}"
 CLIENT_CONF_2L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp"
 
-TEST_NAME_3="t_server_null_client.sh-openvpn_current_udp_fail"
-SHOULD_PASS_3="no"
-CLIENT_EXEC_3="${CLIENT_EXEC}"
-CLIENT_CONF_3="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
-
-# --data-cipher list against server with defaults
-# --cipher ignored
-TEST_NAME_4a="t_server_null_client.sh-openvpn_current_udp_dc1"
-SHOULD_PASS_4a="yes"
-CLIENT_EXEC_4a="${CLIENT_EXEC}"
-CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
-
 # specific --data-cipher against server that supports that cipher
 # --cipher ignored
-TEST_NAME_4b="t_server_null_client.sh-openvpn_current_udp_dc3"
-SHOULD_PASS_4b="yes"
-CLIENT_EXEC_4b="${CLIENT_EXEC}"
-CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
+TEST_NAME_3a="t_server_null_client.sh-openvpn_current_udp_dc3"
+SHOULD_PASS_3a="yes"
+CLIENT_EXEC_3a="${CLIENT_EXEC}"
+CLIENT_CONF_3a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
 
 # specific --data-cipher against server that doesn't support that cipher
 # --cipher ignored
-TEST_NAME_4c="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+TEST_NAME_3b="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+SHOULD_PASS_3b="no"
+CLIENT_EXEC_3b="${CLIENT_EXEC}"
+CLIENT_CONF_3b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
+
+TEST_NAME_4a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
+SHOULD_PASS_4a="yes"
+CLIENT_EXEC_4a="${CLIENT_EXEC}"
+CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
+
+TEST_NAME_4b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
+SHOULD_PASS_4b="yes"
+CLIENT_EXEC_4b="${CLIENT_EXEC}"
+CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
+
+TEST_NAME_4c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
 SHOULD_PASS_4c="no"
 CLIENT_EXEC_4c="${CLIENT_EXEC}"
-CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
-
-TEST_NAME_5a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
-SHOULD_PASS_5a="yes"
-CLIENT_EXEC_5a="${CLIENT_EXEC}"
-CLIENT_CONF_5a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
-
-TEST_NAME_5b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
-SHOULD_PASS_5b="yes"
-CLIENT_EXEC_5b="${CLIENT_EXEC}"
-CLIENT_CONF_5b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
-
-TEST_NAME_5c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
-SHOULD_PASS_5c="no"
-CLIENT_EXEC_5c="${CLIENT_EXEC}"
-CLIENT_CONF_5c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"
+CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75
Gerrit-Change-Number: 1086
Gerrit-PatchSet: 1
Gerrit-Owner: mattock <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, mattock, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email )

Change subject: t_server_null: match test numbers with server numbers
......................................................................

Patch Set 2: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75
Gerrit-Change-Number: 1086
Gerrit-PatchSet: 2
Gerrit-Owner: mattock <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mattock <[email protected]...>
Gerrit-Comment-Date: Wed, 16 Jul 2025 16:56:42 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH v2 1/1 t_server_null: match test numbers with server numbers

In reply to a message not in the archive

From: Samuli Seppänen <[email protected]...>

This makes it obvious which server each test connects to

Change-Id I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1086
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

tests/t_server_null_default.rc +42 -42
index a1c68cd..900f189 100755
@@ -80,67 +80,67 @@
 CLIENT_CIPHER_OPTS=""
 CLIENT_CERT_OPTS="--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"
 
-TEST_RUN_LIST="1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
+TEST_RUN_LIST="1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c"
 CLIENT_CONF_BASE="${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 CLIENT_CONF_BASE_LWIP="${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 
-TEST_NAME_1="t_server_null_client.sh-openvpn_current_udp"
-SHOULD_PASS_1="yes"
-CLIENT_EXEC_1="${CLIENT_EXEC}"
-CLIENT_CONF_1="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+TEST_NAME_1a="t_server_null_client.sh-openvpn_current_udp"
+SHOULD_PASS_1a="yes"
+CLIENT_EXEC_1a="${CLIENT_EXEC}"
+CLIENT_CONF_1a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+
+TEST_NAME_1b="t_server_null_client.sh-openvpn_current_udp_fail"
+SHOULD_PASS_1b="no"
+CLIENT_EXEC_1b="${CLIENT_EXEC}"
+CLIENT_CONF_1b="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
+
+# --data-cipher list against server with defaults
+# --cipher ignored
+TEST_NAME_1c="t_server_null_client.sh-openvpn_current_udp_dc1"
+SHOULD_PASS_1c="yes"
+CLIENT_EXEC_1c="${CLIENT_EXEC}"
+CLIENT_CONF_1c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
 
 TEST_NAME_1L="t_server_null_client.sh-openvpn_current_udp_lwip"
 SHOULD_PASS_1L="yes"
 CLIENT_EXEC_1L="${CLIENT_EXEC}"
 CLIENT_CONF_1L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp"
 
-TEST_NAME_2="t_server_null_client.sh-openvpn_current_tcp"
-SHOULD_PASS_2="yes"
-CLIENT_EXEC_2="${CLIENT_EXEC}"
-CLIENT_CONF_2="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
+TEST_NAME_2a="t_server_null_client.sh-openvpn_current_tcp"
+SHOULD_PASS_2a="yes"
+CLIENT_EXEC_2a="${CLIENT_EXEC}"
+CLIENT_CONF_2a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
 
 TEST_NAME_2L="t_server_null_client.sh-openvpn_current_tcp_lwip"
 SHOULD_PASS_2L="yes"
 CLIENT_EXEC_2L="${CLIENT_EXEC}"
 CLIENT_CONF_2L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp"
 
-TEST_NAME_3="t_server_null_client.sh-openvpn_current_udp_fail"
-SHOULD_PASS_3="no"
-CLIENT_EXEC_3="${CLIENT_EXEC}"
-CLIENT_CONF_3="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
-
-# --data-cipher list against server with defaults
-# --cipher ignored
-TEST_NAME_4a="t_server_null_client.sh-openvpn_current_udp_dc1"
-SHOULD_PASS_4a="yes"
-CLIENT_EXEC_4a="${CLIENT_EXEC}"
-CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
-
 # specific --data-cipher against server that supports that cipher
 # --cipher ignored
-TEST_NAME_4b="t_server_null_client.sh-openvpn_current_udp_dc3"
-SHOULD_PASS_4b="yes"
-CLIENT_EXEC_4b="${CLIENT_EXEC}"
-CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
+TEST_NAME_3a="t_server_null_client.sh-openvpn_current_udp_dc3"
+SHOULD_PASS_3a="yes"
+CLIENT_EXEC_3a="${CLIENT_EXEC}"
+CLIENT_CONF_3a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
 
 # specific --data-cipher against server that doesn't support that cipher
 # --cipher ignored
-TEST_NAME_4c="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+TEST_NAME_3b="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+SHOULD_PASS_3b="no"
+CLIENT_EXEC_3b="${CLIENT_EXEC}"
+CLIENT_CONF_3b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
+
+TEST_NAME_4a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
+SHOULD_PASS_4a="yes"
+CLIENT_EXEC_4a="${CLIENT_EXEC}"
+CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
+
+TEST_NAME_4b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
+SHOULD_PASS_4b="yes"
+CLIENT_EXEC_4b="${CLIENT_EXEC}"
+CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
+
+TEST_NAME_4c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
 SHOULD_PASS_4c="no"
 CLIENT_EXEC_4c="${CLIENT_EXEC}"
-CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
-
-TEST_NAME_5a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
-SHOULD_PASS_5a="yes"
-CLIENT_EXEC_5a="${CLIENT_EXEC}"
-CLIENT_CONF_5a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
-
-TEST_NAME_5b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
-SHOULD_PASS_5b="yes"
-CLIENT_EXEC_5b="${CLIENT_EXEC}"
-CLIENT_CONF_5b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
-
-TEST_NAME_5c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
-SHOULD_PASS_5c="no"
-CLIENT_EXEC_5c="${CLIENT_EXEC}"
-CLIENT_CONF_5c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"
+CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: t_server_null: match test numbers with server numbers

Basically just shuffling numbers around, but making future modifications of the .rc files easier, because it's easier to see which client tests talks to what server instance. Thanks.

Buildbot-tested and no fails :-)

Your patch has been applied to the master branch.

commit 31aedd7fbfd9d4856a5ae7085d15228ec57fb2a1

Author: Samuli Seppänen
Date:   Wed Jul 16 18:56:49 2025 +0200
     t_server_null: match test numbers with server numbers

     Signed-off-by: Samuli Seppänen <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg32194.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#3) to the change originally created by mattock. ( http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

Change subject: t_server_null: match test numbers with server numbers
......................................................................

t_server_null: match test numbers with server numbers

This makes it obvious which server each test connects to

Change-Id I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32194.html

---
M tests/t_server_null_default.rc

1 file changed, 42 insertions(+), 42 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/86/1086/3

tests/t_server_null_default.rc +42 -42
index a1c68cd..900f189 100755
@@ -80,67 +80,67 @@
 CLIENT_CIPHER_OPTS=""
 CLIENT_CERT_OPTS="--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"
 
-TEST_RUN_LIST="1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
+TEST_RUN_LIST="1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c"
 CLIENT_CONF_BASE="${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 CLIENT_CONF_BASE_LWIP="${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 
-TEST_NAME_1="t_server_null_client.sh-openvpn_current_udp"
-SHOULD_PASS_1="yes"
-CLIENT_EXEC_1="${CLIENT_EXEC}"
-CLIENT_CONF_1="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+TEST_NAME_1a="t_server_null_client.sh-openvpn_current_udp"
+SHOULD_PASS_1a="yes"
+CLIENT_EXEC_1a="${CLIENT_EXEC}"
+CLIENT_CONF_1a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+
+TEST_NAME_1b="t_server_null_client.sh-openvpn_current_udp_fail"
+SHOULD_PASS_1b="no"
+CLIENT_EXEC_1b="${CLIENT_EXEC}"
+CLIENT_CONF_1b="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
+
+# --data-cipher list against server with defaults
+# --cipher ignored
+TEST_NAME_1c="t_server_null_client.sh-openvpn_current_udp_dc1"
+SHOULD_PASS_1c="yes"
+CLIENT_EXEC_1c="${CLIENT_EXEC}"
+CLIENT_CONF_1c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
 
 TEST_NAME_1L="t_server_null_client.sh-openvpn_current_udp_lwip"
 SHOULD_PASS_1L="yes"
 CLIENT_EXEC_1L="${CLIENT_EXEC}"
 CLIENT_CONF_1L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp"
 
-TEST_NAME_2="t_server_null_client.sh-openvpn_current_tcp"
-SHOULD_PASS_2="yes"
-CLIENT_EXEC_2="${CLIENT_EXEC}"
-CLIENT_CONF_2="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
+TEST_NAME_2a="t_server_null_client.sh-openvpn_current_tcp"
+SHOULD_PASS_2a="yes"
+CLIENT_EXEC_2a="${CLIENT_EXEC}"
+CLIENT_CONF_2a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
 
 TEST_NAME_2L="t_server_null_client.sh-openvpn_current_tcp_lwip"
 SHOULD_PASS_2L="yes"
 CLIENT_EXEC_2L="${CLIENT_EXEC}"
 CLIENT_CONF_2L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp"
 
-TEST_NAME_3="t_server_null_client.sh-openvpn_current_udp_fail"
-SHOULD_PASS_3="no"
-CLIENT_EXEC_3="${CLIENT_EXEC}"
-CLIENT_CONF_3="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
-
-# --data-cipher list against server with defaults
-# --cipher ignored
-TEST_NAME_4a="t_server_null_client.sh-openvpn_current_udp_dc1"
-SHOULD_PASS_4a="yes"
-CLIENT_EXEC_4a="${CLIENT_EXEC}"
-CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
-
 # specific --data-cipher against server that supports that cipher
 # --cipher ignored
-TEST_NAME_4b="t_server_null_client.sh-openvpn_current_udp_dc3"
-SHOULD_PASS_4b="yes"
-CLIENT_EXEC_4b="${CLIENT_EXEC}"
-CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
+TEST_NAME_3a="t_server_null_client.sh-openvpn_current_udp_dc3"
+SHOULD_PASS_3a="yes"
+CLIENT_EXEC_3a="${CLIENT_EXEC}"
+CLIENT_CONF_3a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
 
 # specific --data-cipher against server that doesn't support that cipher
 # --cipher ignored
-TEST_NAME_4c="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+TEST_NAME_3b="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+SHOULD_PASS_3b="no"
+CLIENT_EXEC_3b="${CLIENT_EXEC}"
+CLIENT_CONF_3b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
+
+TEST_NAME_4a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
+SHOULD_PASS_4a="yes"
+CLIENT_EXEC_4a="${CLIENT_EXEC}"
+CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
+
+TEST_NAME_4b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
+SHOULD_PASS_4b="yes"
+CLIENT_EXEC_4b="${CLIENT_EXEC}"
+CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
+
+TEST_NAME_4c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
 SHOULD_PASS_4c="no"
 CLIENT_EXEC_4c="${CLIENT_EXEC}"
-CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
-
-TEST_NAME_5a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
-SHOULD_PASS_5a="yes"
-CLIENT_EXEC_5a="${CLIENT_EXEC}"
-CLIENT_CONF_5a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
-
-TEST_NAME_5b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
-SHOULD_PASS_5b="yes"
-CLIENT_EXEC_5b="${CLIENT_EXEC}"
-CLIENT_CONF_5b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
-
-TEST_NAME_5c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
-SHOULD_PASS_5c="no"
-CLIENT_EXEC_5c="${CLIENT_EXEC}"
-CLIENT_CONF_5c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"
+CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75
Gerrit-Change-Number: 1086
Gerrit-PatchSet: 3
Gerrit-Owner: mattock <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email )

Change subject: t_server_null: match test numbers with server numbers
......................................................................

t_server_null: match test numbers with server numbers

This makes it obvious which server each test connects to

Change-Id I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32194.html

---
M tests/t_server_null_default.rc

1 file changed, 42 insertions(+), 42 deletions(-)
tests/t_server_null_default.rc +42 -42
index a1c68cd..900f189 100755
@@ -80,67 +80,67 @@
 CLIENT_CIPHER_OPTS=""
 CLIENT_CERT_OPTS="--ca ${CA} --cert ${CLIENT_CERT} --key ${CLIENT_KEY} --tls-auth ${TA} 1"
 
-TEST_RUN_LIST="1 1L 2 2L 3 4a 4b 4c 5a 5b 5c"
+TEST_RUN_LIST="1a 1b 1c 1L 2a 2L 3a 3b 4a 4b 4c"
 CLIENT_CONF_BASE="${CLIENT_NULL_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 CLIENT_CONF_BASE_LWIP="${CLIENT_LWIP_OPTS} ${CLIENT_BASE_OPTS} ${CLIENT_CIPHER_OPTS} ${CLIENT_CERT_OPTS}"
 
-TEST_NAME_1="t_server_null_client.sh-openvpn_current_udp"
-SHOULD_PASS_1="yes"
-CLIENT_EXEC_1="${CLIENT_EXEC}"
-CLIENT_CONF_1="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+TEST_NAME_1a="t_server_null_client.sh-openvpn_current_udp"
+SHOULD_PASS_1a="yes"
+CLIENT_EXEC_1a="${CLIENT_EXEC}"
+CLIENT_CONF_1a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp"
+
+TEST_NAME_1b="t_server_null_client.sh-openvpn_current_udp_fail"
+SHOULD_PASS_1b="no"
+CLIENT_EXEC_1b="${CLIENT_EXEC}"
+CLIENT_CONF_1b="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
+
+# --data-cipher list against server with defaults
+# --cipher ignored
+TEST_NAME_1c="t_server_null_client.sh-openvpn_current_udp_dc1"
+SHOULD_PASS_1c="yes"
+CLIENT_EXEC_1c="${CLIENT_EXEC}"
+CLIENT_CONF_1c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
 
 TEST_NAME_1L="t_server_null_client.sh-openvpn_current_udp_lwip"
 SHOULD_PASS_1L="yes"
 CLIENT_EXEC_1L="${CLIENT_EXEC}"
 CLIENT_CONF_1L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1194 udp --proto udp"
 
-TEST_NAME_2="t_server_null_client.sh-openvpn_current_tcp"
-SHOULD_PASS_2="yes"
-CLIENT_EXEC_2="${CLIENT_EXEC}"
-CLIENT_CONF_2="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
+TEST_NAME_2a="t_server_null_client.sh-openvpn_current_tcp"
+SHOULD_PASS_2a="yes"
+CLIENT_EXEC_2a="${CLIENT_EXEC}"
+CLIENT_CONF_2a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1195 tcp --proto tcp"
 
 TEST_NAME_2L="t_server_null_client.sh-openvpn_current_tcp_lwip"
 SHOULD_PASS_2L="yes"
 CLIENT_EXEC_2L="${CLIENT_EXEC}"
 CLIENT_CONF_2L="${CLIENT_CONF_BASE_LWIP} --remote 127.0.0.1 1195 tcp --proto tcp"
 
-TEST_NAME_3="t_server_null_client.sh-openvpn_current_udp_fail"
-SHOULD_PASS_3="no"
-CLIENT_EXEC_3="${CLIENT_EXEC}"
-CLIENT_CONF_3="${CLIENT_CONF_BASE} --remote 127.0.0.1 11194 udp --proto udp"
-
-# --data-cipher list against server with defaults
-# --cipher ignored
-TEST_NAME_4a="t_server_null_client.sh-openvpn_current_udp_dc1"
-SHOULD_PASS_4a="yes"
-CLIENT_EXEC_4a="${CLIENT_EXEC}"
-CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1194 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC:DEFAULT"
-
 # specific --data-cipher against server that supports that cipher
 # --cipher ignored
-TEST_NAME_4b="t_server_null_client.sh-openvpn_current_udp_dc3"
-SHOULD_PASS_4b="yes"
-CLIENT_EXEC_4b="${CLIENT_EXEC}"
-CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
+TEST_NAME_3a="t_server_null_client.sh-openvpn_current_udp_dc3"
+SHOULD_PASS_3a="yes"
+CLIENT_EXEC_3a="${CLIENT_EXEC}"
+CLIENT_CONF_3a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-128-CBC --data-ciphers AES-192-CBC"
 
 # specific --data-cipher against server that doesn't support that cipher
 # --cipher ignored
-TEST_NAME_4c="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+TEST_NAME_3b="t_server_null_client.sh-openvpn_current_udp_dc3_fail"
+SHOULD_PASS_3b="no"
+CLIENT_EXEC_3b="${CLIENT_EXEC}"
+CLIENT_CONF_3b="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
+
+TEST_NAME_4a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
+SHOULD_PASS_4a="yes"
+CLIENT_EXEC_4a="${CLIENT_EXEC}"
+CLIENT_CONF_4a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
+
+TEST_NAME_4b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
+SHOULD_PASS_4b="yes"
+CLIENT_EXEC_4b="${CLIENT_EXEC}"
+CLIENT_CONF_4b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
+
+TEST_NAME_4c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
 SHOULD_PASS_4c="no"
 CLIENT_EXEC_4c="${CLIENT_EXEC}"
-CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote 127.0.0.1 1196 udp --proto udp --cipher AES-192-CBC --data-ciphers AES-128-CBC"
-
-TEST_NAME_5a="t_server_null_client.sh-openvpn_current_multisocket_ipv4_tcp"
-SHOULD_PASS_5a="yes"
-CLIENT_EXEC_5a="${CLIENT_EXEC}"
-CLIENT_CONF_5a="${CLIENT_CONF_BASE} --remote 127.0.0.1 1197 tcp"
-
-TEST_NAME_5b="t_server_null_client.sh-openvpn_current_multisocket_ipv6_udp"
-SHOULD_PASS_5b="yes"
-CLIENT_EXEC_5b="${CLIENT_EXEC}"
-CLIENT_CONF_5b="${CLIENT_CONF_BASE} --remote ::1 1197 udp"
-
-TEST_NAME_5c="t_server_null_client.sh-openvpn_current_multisocket_ipv6_tcp_fail"
-SHOULD_PASS_5c="no"
-CLIENT_EXEC_5c="${CLIENT_EXEC}"
-CLIENT_CONF_5c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"
+CLIENT_CONF_4c="${CLIENT_CONF_BASE} --remote ::1 1197 tcp"

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1086?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I49c69144ab6dcf1d26c96c2eafc2346ad4e0ca75
Gerrit-Change-Number: 1086
Gerrit-PatchSet: 3
Gerrit-Owner: mattock <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged