From 8fa9370a0c0d576c5e8cb945e4195541be7f3823 Mon Sep 17 00:00:00 2001
From: Franz Schwartau <franz@electromail.org>
Date: Tue, 29 Aug 2023 10:58:31 +0200
Subject: Rename test variables for upcoming new variables with the same name


diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index 232305a..c8dbdf6 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -25,8 +25,8 @@
   'NP_HOST_TCP_POP' => 'pop.web.de',
   'NP_HOST_TCP_PROXY' => 'localhost',
   'NP_HOST_TCP_SMTP' => 'localhost',
-  'NP_HOST_TCP_SMTP_NOTLS' => '',
-  'NP_HOST_TCP_SMTP_TLS' => '',
+  'NP_HOST_TCP_SMTP_NOSTARTTLS' => '',
+  'NP_HOST_TCP_SMTP_STARTTLS' => '',
   'NP_HOST_TLS_CERT' => 'localhost',
   'NP_HOST_TLS_HTTP' => 'localhost',
   'NP_HOST_UDP_TIME' => 'none',
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index aa6dae4..fd09ed2 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -8,12 +8,12 @@ use strict;
 use Test::More;
 use NPTest;
 
-my $host_tcp_smtp      = getTestParameter( "NP_HOST_TCP_SMTP", 
+my $host_tcp_smtp            = getTestParameter( "NP_HOST_TCP_SMTP",
 					   "A host providing an SMTP Service (a mail server)", "mailhost");
-my $host_tcp_smtp_tls  = getTestParameter( "NP_HOST_TCP_SMTP_TLS",
-					   "A host providing SMTP with TLS", $host_tcp_smtp);
-my $host_tcp_smtp_notls = getTestParameter( "NP_HOST_TCP_SMTP_NOTLS",
-					   "A host providing SMTP without TLS", "");
+my $host_tcp_smtp_starttls   = getTestParameter( "NP_HOST_TCP_SMTP_STARTTLS",
+					   "A host providing SMTP with STARTTLS", $host_tcp_smtp);
+my $host_tcp_smtp_nostarttls = getTestParameter( "NP_HOST_TCP_SMTP_NOSTARTTLS",
+					   "A host providing SMTP without STARTTLS", "");
 
 my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE", 
 					   "The hostname of system not responsive to network requests", "10.0.0.1" );
@@ -45,16 +45,16 @@ SKIP: {
 }
 
 SKIP: {
-	skip "No SMTP server with TLS defined", 1 unless $host_tcp_smtp_tls;
-	# SSL connection for TLS
-	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls -p 25 -S" );
+	skip "No SMTP server with STARTTLS defined", 1 unless $host_tcp_smtp_starttls;
+	# SSL connection for STARTTLS
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_starttls -p 25 -S" );
 	is ($res->return_code, 0, "OK, with STARTTLS" );
 }
 
 SKIP: {
-	skip "No SMTP server without TLS defined", 2 unless $host_tcp_smtp_notls;
-	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_notls -p 25 -S" );
-	is ($res->return_code, 1, "OK, got warning from server without TLS");
+	skip "No SMTP server without STARTTLS defined", 2 unless $host_tcp_smtp_nostarttls;
+	$res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_nostarttls -p 25 -S" );
+	is ($res->return_code, 1, "OK, got warning from server without STARTTLS");
 	is ($res->output, "WARNING - TLS not supported by server", "Right error message" );
 }
 
-- 
cgit v0.10-9-g596f