From b3fdf52f2be18ba155368392a35a1093d01449a7 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Wed, 31 Jan 2024 10:49:37 +0100 Subject: [PATCH] unifiy test output --- tests/expected/lslogins/checkuser | 9 ++------- tests/ts/lslogins/checkuser | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/expected/lslogins/checkuser b/tests/expected/lslogins/checkuser index 584c809e3..b68c2dcf0 100644 --- a/tests/expected/lslogins/checkuser +++ b/tests/expected/lslogins/checkuser @@ -1,7 +1,2 @@ -Username: root -Last login: Jan29/07:45 -Last terminal: test-tty -Last hostname: test-host - -Last logs: - +USER LAST-LOGIN LAST-TTY LAST-HOSTNAME +root Jan30/02:45 test-tty test-host diff --git a/tests/ts/lslogins/checkuser b/tests/ts/lslogins/checkuser index 5971285b6..74b1e35c1 100755 --- a/tests/ts/lslogins/checkuser +++ b/tests/ts/lslogins/checkuser @@ -18,7 +18,7 @@ fi sqlite3 $TS_SELF/lastlog2.db < $TS_SELF/create_db.sql # tests for lastlog2 environment -TZ=US/Pacific "$TS_CMD_LSLOGINS" --lastlog-file=/dev/null --lastlog2-file="${TS_SELF}/lastlog2.db" --wtmp-file=/dev/null --btmp-file=/dev/null --output USER,LAST-LOGIN,LAST-TTY,LAST-HOSTNAME root > "$TS_OUTPUT" +TZ=US/Pacific "$TS_CMD_LSLOGINS" --lastlog-file=/dev/null --lastlog2-file="${TS_SELF}/lastlog2.db" --wtmp-file=/dev/null --btmp-file=/dev/null --output USER,LAST-LOGIN,LAST-TTY,LAST-HOSTNAME --logins=root > "$TS_OUTPUT" rm $TS_SELF/lastlog2.db ts_finalize -- 2.47.3