aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-11-06 20:16:57 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-11-06 20:16:57 +0300
commita448a249031d207d83535c160eb329d0224ac923 (patch)
tree70aeecbbf4597d2321b3738ff540c9332d4ec0ac /tests
parentf41599c8e9435f3dfec60b872c2b4ae31177efdd (diff)
Fix mistreating test operation timeout as test timeout in some case
Diffstat (limited to 'tests')
-rw-r--r--tests/test/script/runner/timeout.testscript12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/test/script/runner/timeout.testscript b/tests/test/script/runner/timeout.testscript
index ae8f535..bf39034 100644
--- a/tests/test/script/runner/timeout.testscript
+++ b/tests/test/script/runner/timeout.testscript
@@ -314,7 +314,8 @@
{
: set
:
- $c <<EOI && $b config.test.timeout=1/10 2>>~%EOE% != 0
+ $c <<EOI && $b config.test.timeout=1 2>>~%EOE% != 0
+ timeout 10;
$* -l 3
EOI
%testscript:.*: error: .+ terminated: execution timeout expired%
@@ -323,7 +324,8 @@
: reset
:
- $c <<EOI && $b config.test.timeout=1/10 config.test.timeout=0/10
+ $c <<EOI && $b config.test.timeout=1 config.test.timeout=0/10
+ timeout 10;
$* -l 3
EOI
@@ -355,7 +357,8 @@
{
: set
:
- $c <<EOI && $b config.test.timeout=10/1 2>>~%EOE% != 0
+ $c <<EOI && $b config.test.timeout=/1 2>>~%EOE% != 0
+ timeout 10;
$* -l 3
EOI
%testscript:.*: error: .+ terminated: execution timeout expired%
@@ -364,7 +367,8 @@
: reset
:
- $c <<EOI && $b config.test.timeout=10/1 config.test.timeout=10/0
+ $c <<EOI && $b config.test.timeout=/1 config.test.timeout=10/0
+ timeout 10;
$* -l 3
EOI