From 3803329e93e4a37b1408e1e7e3da391fbe75cee3 Mon Sep 17 00:00:00 2001
From: OpenAI <oai@example.com>
Date: Fri, 12 Jun 2026 10:30:52 +0000
Subject: [PATCH] tests: relogin quota smoke directly from DQTC

---
 test/quota/DQTC.BAT   | 28 ++++++++++++++++++++--------
 test/quota/DQTSTA.BAT | 43 ++++++-------------------------------------
 2 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/test/quota/DQTC.BAT b/test/quota/DQTC.BAT
index 887af54..c87e491 100644
--- a/test/quota/DQTC.BAT
+++ b/test/quota/DQTC.BAT
@@ -96,20 +96,32 @@ GOTO END
 
 :RELSUP
 TYPE C:\DQTTMP\WRITE.LOG
-IF EXIST C:\DQTTMP\DQTREL.BAT GOTO AUTOREL
-GOTO MANUAL
-
-:AUTOREL
 ECHO === LOGOUT NOPASSUSER === >> C:\DQTTMP\HELPER.TXT
 C:\DQTTMP\LOGOUT > C:\DQTTMP\D03_LOGOUT_USER.OUT
+IF "%LGNTPWD%"=="" GOTO MANUAL
+GOTO AUTOREL
 
-ECHO === QUEUE SUPERVISOR RELOGIN HELPER === >> C:\DQTTMP\HELPER.TXT
-C:\DQTTMP\DLYSTRT /T:2 C:\DQTTMP\DQTREL.BAT > C:\DQTTMP\D03_RELQUEUE.OUT
-ECHO DQTC fertig. SUPERVISOR relogin und PART2 wurden per DLYSTRT gestartet.
+:AUTOREL
+ECHO === LOGIN SUPERVISOR DIRECTLY === >> C:\DQTTMP\HELPER.TXT
+F:
+CD \LOGIN
+LOGIN /NS SUPERVISOR /PWD:%LGNTPWD% > C:\DQTTMP\D04_LOGIN_SUP.OUT
+F:
+CD \
+IF EXIST F:\DQTSTA.BAT GOTO QUEUEP2
+ECHO F:\DQTSTA.BAT missing after supervisor relogin. >> C:\DQTTMP\HELPER.TXT
+GOTO MANUAL
+
+:QUEUEP2
+ECHO === QUEUE DQTSTA PART2 === >> C:\DQTTMP\HELPER.TXT
+C:
+CD \DQTTMP
+DLYSTRT /T:2 F:\DQTSTA.BAT PART2 > C:\DQTTMP\D05_P2.OUT
+ECHO DQTC fertig. SUPERVISOR relogin und PART2 wurden direkt/DLYSTRT gestartet.
 GOTO END
 
 :MANUAL
-ECHO C:\DQTTMP\DQTREL.BAT missing; automatic SUPERVISOR relogin skipped. >> C:\DQTTMP\HELPER.TXT
+ECHO Automatic SUPERVISOR relogin skipped or failed. >> C:\DQTTMP\HELPER.TXT
 ECHO Bitte manuell als SUPERVISOR einloggen und dann ausfuehren:
 ECHO   F:
 ECHO   DQTSTA PART2
diff --git a/test/quota/DQTSTA.BAT b/test/quota/DQTSTA.BAT
index 1af80ed..ed72ea1 100644
--- a/test/quota/DQTSTA.BAT
+++ b/test/quota/DQTSTA.BAT
@@ -100,43 +100,12 @@ ECHO ERROR: C:\DQTTMP\LOGOUT.EXE not copied.
 GOTO END
 :HVLOGOUT
 
-IF "%LGNTPWD%"=="" GOTO SKIPREL
-ECHO Creating local supervisor relogin helper. >> F:\DQTCMP\RUN.LOG
-ECHO @ECHO OFF> C:\DQTTMP\DQTREL.BAT
-ECHO REM Generated by DQTSTA. Mirrors the RIGHTS helper relogin flow.>> C:\DQTTMP\DQTREL.BAT
-ECHO C:>> C:\DQTTMP\DQTREL.BAT
-ECHO CD \DQTTMP>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO DQTREL supervisor relogin helper started. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO F:>> C:\DQTTMP\DQTREL.BAT
-ECHO CD \>> C:\DQTTMP\DQTREL.BAT
-ECHO IF EXIST \LOGIN\LOGIN.EXE GOTO HAVELOGIN>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO F:\LOGIN\LOGIN.EXE not found before supervisor relogin. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO GOTO MANUAL>> C:\DQTTMP\DQTREL.BAT
-ECHO :HAVELOGIN>> C:\DQTTMP\DQTREL.BAT
-ECHO F:\LOGIN\LOGIN /NS SUPERVISOR /PWD:%LGNTPWD% ^> C:\DQTTMP\D04_LOGIN_SUP.OUT>> C:\DQTTMP\DQTREL.BAT
-ECHO F:>> C:\DQTTMP\DQTREL.BAT
-ECHO CD \>> C:\DQTTMP\DQTREL.BAT
-ECHO IF EXIST \DQTSTA.BAT GOTO QUEUEP2>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO F: not restored or \DQTSTA.BAT not visible after supervisor relogin. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO GOTO MANUAL>> C:\DQTTMP\DQTREL.BAT
-ECHO :QUEUEP2>> C:\DQTTMP\DQTREL.BAT
-ECHO C:>> C:\DQTTMP\DQTREL.BAT
-ECHO CD \DQTTMP>> C:\DQTTMP\DQTREL.BAT
-ECHO IF EXIST DLYSTRT.EXE GOTO HVDLY>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO C:\DQTTMP\DLYSTRT.EXE not found before PART2 queue. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO GOTO MANUAL>> C:\DQTTMP\DQTREL.BAT
-ECHO :HVDLY>> C:\DQTTMP\DQTREL.BAT
-ECHO DLYSTRT /T:2 F:\DQTSTA.BAT PART2 ^> C:\DQTTMP\D05_P2.OUT>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO DQTREL queued F:\DQTSTA.BAT PART2. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO GOTO END>> C:\DQTTMP\DQTREL.BAT
-ECHO :MANUAL>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO Manual steps required: LOGIN /NS SUPERVISOR, F:, DQTSTA PART2. ^>^> C:\DQTTMP\HELPER.TXT>> C:\DQTTMP\DQTREL.BAT
-ECHO ECHO Bitte manuell als SUPERVISOR einloggen und dann F:\DQTSTA PART2 starten.>> C:\DQTTMP\DQTREL.BAT
-ECHO :END>> C:\DQTTMP\DQTREL.BAT
-GOTO RELREADY
-:SKIPREL
-ECHO LGNTPWD is not set; automatic supervisor relogin helper was not generated. >> F:\DQTCMP\RUN.LOG
-:RELREADY
+IF "%LGNTPWD%"=="" GOTO NOPWD
+ECHO LGNTPWD is set; DQTC will relogin SUPERVISOR directly after the write test. >> F:\DQTCMP\RUN.LOG
+GOTO PWDOK
+:NOPWD
+ECHO WARNING: LGNTPWD is not set; DQTC cannot relogin SUPERVISOR automatically. >> F:\DQTCMP\RUN.LOG
+:PWDOK
 
 C:
 CD \DQTTMP