From 4ebdd8c0dccb78daf6cffd7c8a7a3e80317c2c11 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Thu, 9 Dec 2021 19:32:48 +0300
Subject: [PATCH] test: remove {grep,wait}_log limit in some tests
Needed for the tests to pass with enabled audit log.
---
test/box/cfg.result | 10 +++++-----
test/box/cfg.test.lua | 10 +++++-----
test/box/errinj.result | 4 ++--
test/box/errinj.test.lua | 4 ++--
test/box/net.box_watcher.result | 2 +-
test/box/net.box_watcher.test.lua | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/test/box/cfg.result b/test/box/cfg.result
index f4606addc7..70d3b766c3 100644
--- a/test/box/cfg.result
+++ b/test/box/cfg.result
@@ -638,7 +638,7 @@ test_run:cmd("start server cfg_tester6")
| ---
| - true
| ...
-test_run:grep_log('cfg_tester6', 'set \'vinyl_memory\' configuration option to 1073741824', 1000)
+test_run:grep_log('cfg_tester6', 'set \'vinyl_memory\' configuration option to 1073741824')
| ---
| - set 'vinyl_memory' configuration option to 1073741824
| ...
@@ -663,12 +663,12 @@ test_run:cmd("start server cfg_tester7")
| - true
| ...
-- test there is replication log in log
-test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to', 1000)
+test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to')
| ---
| - set 'replication' configuration option to
| ...
-- test there is no password in log
-test_run:grep_log('cfg_tester7', 'test%-cluster%-cookie', 1000)
+test_run:grep_log('cfg_tester7', 'test%-cluster%-cookie')
| ---
| - null
| ...
@@ -696,7 +696,7 @@ test_run:cmd("start server cfg_tester8")
version_warning = "Please, consider using box.schema.upgrade()."
| ---
| ...
-test_run:wait_log('cfg_tester8', version_warning, 1000, 1.0) ~= nil
+test_run:wait_log('cfg_tester8', version_warning, nil, 1.0) ~= nil
| ---
| - true
| ...
@@ -718,7 +718,7 @@ test_run:cmd("start server cfg_tester9")
| - true
| ...
--- Check that the warning isn't printed.
-test_run:wait_log('cfg_tester9', version_warning, 1000, 1.0) == nil
+test_run:wait_log('cfg_tester9', version_warning, nil, 1.0) == nil
| ---
| - true
| ...
diff --git a/test/box/cfg.test.lua b/test/box/cfg.test.lua
index 4d873e464a..6342bb3df9 100644
--- a/test/box/cfg.test.lua
+++ b/test/box/cfg.test.lua
@@ -143,7 +143,7 @@ test_run:cmd("clear filter")
--
test_run:cmd('create server cfg_tester6 with script = "box/lua/cfg_test5.lua"')
test_run:cmd("start server cfg_tester6")
-test_run:grep_log('cfg_tester6', 'set \'vinyl_memory\' configuration option to 1073741824', 1000)
+test_run:grep_log('cfg_tester6', 'set \'vinyl_memory\' configuration option to 1073741824')
test_run:cmd("stop server cfg_tester6")
test_run:cmd("cleanup server cfg_tester6")
@@ -153,9 +153,9 @@ test_run:cmd("cleanup server cfg_tester6")
test_run:cmd('create server cfg_tester7 with script = "box/lua/cfg_test6.lua"')
test_run:cmd("start server cfg_tester7")
-- test there is replication log in log
-test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to', 1000)
+test_run:grep_log('cfg_tester7', 'set \'replication\' configuration option to')
-- test there is no password in log
-test_run:grep_log('cfg_tester7', 'test%-cluster%-cookie', 1000)
+test_run:grep_log('cfg_tester7', 'test%-cluster%-cookie')
test_run:cmd("stop server cfg_tester7")
test_run:cmd("cleanup server cfg_tester7")
@@ -166,13 +166,13 @@ test_run:cmd('create server cfg_tester8 with script = "box/lua/cfg_test8.lua", w
test_run:cmd("start server cfg_tester8")
--- Check that the warning is printed.
version_warning = "Please, consider using box.schema.upgrade()."
-test_run:wait_log('cfg_tester8', version_warning, 1000, 1.0) ~= nil
+test_run:wait_log('cfg_tester8', version_warning, nil, 1.0) ~= nil
test_run:cmd("stop server cfg_tester8")
test_run:cmd("cleanup server cfg_tester8")
test_run:cmd('create server cfg_tester9 with script = "box/lua/cfg_test1.lua"')
test_run:cmd("start server cfg_tester9")
--- Check that the warning isn't printed.
-test_run:wait_log('cfg_tester9', version_warning, 1000, 1.0) == nil
+test_run:wait_log('cfg_tester9', version_warning, nil, 1.0) == nil
test_run:cmd("stop server cfg_tester9")
test_run:cmd("cleanup server cfg_tester9")
diff --git a/test/box/errinj.result b/test/box/errinj.result
index 7cf1d7a639..5a9323209a 100644
--- a/test/box/errinj.result
+++ b/test/box/errinj.result
@@ -1341,10 +1341,10 @@ log.info(string.rep('a', 1000))
_ = fiber.create(long_poll)
---
...
-while not test_run:grep_log('default', 'can not allocate memory for a new message', 1000) do fiber.sleep(0.01) end
+while not test_run:grep_log('default', 'can not allocate memory for a new message') do fiber.sleep(0.01) end
---
...
-test_run:grep_log('default', 'stopping input on connection', 1000) ~= nil
+test_run:grep_log('default', 'stopping input on connection') ~= nil
---
- true
...
diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua
index 5e37b4da56..ccbfa0369a 100644
--- a/test/box/errinj.test.lua
+++ b/test/box/errinj.test.lua
@@ -466,8 +466,8 @@ log = require('log')
-- produced by a previous test.
log.info(string.rep('a', 1000))
_ = fiber.create(long_poll)
-while not test_run:grep_log('default', 'can not allocate memory for a new message', 1000) do fiber.sleep(0.01) end
-test_run:grep_log('default', 'stopping input on connection', 1000) ~= nil
+while not test_run:grep_log('default', 'can not allocate memory for a new message') do fiber.sleep(0.01) end
+test_run:grep_log('default', 'stopping input on connection') ~= nil
started == 1
continue = true
errinj.set("ERRINJ_TESTING", false)
diff --git a/test/box/net.box_watcher.result b/test/box/net.box_watcher.result
index 078d2358ac..baa2004b19 100644
--- a/test/box/net.box_watcher.result
+++ b/test/box/net.box_watcher.result
@@ -180,7 +180,7 @@ w:unregister()
w = conn:watch('foobar', function() error('foobar') end)
| ---
| ...
-test_run:wait_log('default', 'foobar', 1000)
+test_run:wait_log('default', 'foobar')
| ---
| - foobar
| ...
diff --git a/test/box/net.box_watcher.test.lua b/test/box/net.box_watcher.test.lua
index 96cdb94842..36c30c9a3c 100644
--- a/test/box/net.box_watcher.test.lua
+++ b/test/box/net.box_watcher.test.lua
@@ -62,7 +62,7 @@ w:unregister()
-- Raising error from a callback.
w = conn:watch('foobar', function() error('foobar') end)
-test_run:wait_log('default', 'foobar', 1000)
+test_run:wait_log('default', 'foobar')
w:unregister()
-- Broadcasting data that can't be encoded in msgpack.
--
GitLab