Merge pull request ElektraInitiative#4707 from joni1993/fixrecordertests

[FLOSS T1] shellrecorder: fix/extends two shell recorder checks
Bujuhu · Nov 24, 2022 · 3ab2721 · 3ab2721
2 parents f7874ef + cb1d617
commit 3ab2721
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -266,7 +266,7 @@ This section keeps you up-to-date with the multi-language support provided by El
 - <<TODO>>
 - Sed: Add spelling correction for "key-value storage" _(@Bujuhu)_
 - <<TODO>>
-- <<TODO>>
+- Fix/extends some shell recorder tests _(@Joni1993)_
 - <<TODO>>
 - <<TODO>>
 - Fix warning parsing in shell recorder _(@Joni1993)_

diff --git a/tests/shell/shell_recorder/mathcheck.esr b/tests/shell/shell_recorder/mathcheck.esr
@@ -111,7 +111,7 @@ STDOUT: 5
 < kdb set $Mountpoint/check/k 7.6
 < kdb meta-set $Mountpoint/check/k check/math "== + ../a ../b"
 
-ERROR: 123
+ERROR: C03200
 < kdb set $Mountpoint/check/k 7.7
 
 RET: 0

diff --git a/tests/shell/shell_recorder/selftest.esr b/tests/shell/shell_recorder/selftest.esr
@@ -5,22 +5,25 @@ File: config.ini
 RET: 0
 < kdb mount $File $Mountpoint $Storage
 
-STDOUT: Create a new key user:/test/key with string "value"
+STDOUT: Create a new key user:/tests/key with string "value"
 < kdb set $Mountpoint/key value
 
 STDOUT: Set string to "value"
 < kdb set $Mountpoint/key value
 
-STDOUT-REGEX: .*value.
-< kdb set $Mountpoint/key value
+STDOUT-REGEX: .*value2.
+< kdb set $Mountpoint/key2 value2
+
+STDOUT: user:/tests/keyuser:/tests/key2
+< kdb find -0 user:/tests
 
-STDERR: The command kdb.* not-a-command is not known
+STDERR: The command .*kdb.* not-a-command is not known
 < kdb not-a-command 1>/dev/null
 
 STDERR: .+not-a-command.+
 < kdb not-a-command 1>/dev/null
 
-STDOUT: Create a new key user:/test/\/evil\\\/tripleEscaped\\/doubleEscaped/key/.withADot/..andADoubleDot with string "txt"
+STDOUT: Create a new key user:/tests/\/evil\\\/tripleEscaped\\/doubleEscaped/key/.withADot/..andADoubleDot with string "txt"
 < kdb set $Mountpoint/\\/evil\\\\\\/tripleEscaped\\\\/doubleEscaped/key/.withADot/..andADoubleDot txt
 
 < cat > `kdb file $Mountpoint` <<EOF
@@ -32,10 +35,15 @@ STDOUT: Create a new key user:/test/\/evil\\\/tripleEscaped\\/doubleEscaped/key/
 STDOUT: [section]⏎key="multi⏎line"
 < cat `kdb file $Mountpoint`
 
-WARNINGS: 175,175
+WARNINGS: C03100,C03100
 < kdb ls $Mountpoint
 
 < kdb rm -r $Mountpoint
 
 RET: 0
 < kdb umount $Mountpoint
+
+STDERR: Regex error.*
+< kdb find "["
+
+