diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2018-02-27 19:21:20 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2018-02-27 19:21:20 +0200 |
| commit | e17a40203e8527a07f347bcc3fa9447d37f4d1bb (patch) | |
| tree | 00b009e5c5d34ea57d1572e601d05fe17182ea86 /test/functional | |
| parent | 2bda2989eee893c42ff04f48a904f00a33a7d07a (diff) | |
| download | rspamd-e17a40203e8527a07f347bcc3fa9447d37f4d1bb.tar.gz rspamd-e17a40203e8527a07f347bcc3fa9447d37f4d1bb.zip | |
[Test] Extend & enable combined milter test
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/cases/180_milter.robot | 1 | ||||
| -rw-r--r-- | test/functional/lua/miltertest/combined.lua | 23 |
2 files changed, 19 insertions, 5 deletions
diff --git a/test/functional/cases/180_milter.robot b/test/functional/cases/180_milter.robot index 6e8f0c364..814fd0de5 100644 --- a/test/functional/cases/180_milter.robot +++ b/test/functional/cases/180_milter.robot @@ -24,7 +24,6 @@ DEFER Milter Test mt4.lua COMBINED TEST - [Tags] isbroken Milter Test combined.lua *** Keywords *** diff --git a/test/functional/lua/miltertest/combined.lua b/test/functional/lua/miltertest/combined.lua index 891929458..964fa878a 100644 --- a/test/functional/lua/miltertest/combined.lua +++ b/test/functional/lua/miltertest/combined.lua @@ -12,9 +12,24 @@ local empty_function = function() end setup = empty_function teardown = empty_function -dofile('mt1.lua') -dofile('mt2.lua') -dofile('mt3.lua') -dofile('mt4.lua') +local function shuffle(tbl) + local size = #tbl + for i = size, 1, -1 do + local rand = math.random(size) + tbl[i], tbl[rand] = tbl[rand], tbl[i] + end + return tbl +end + +local files = {'mt1.lua','mt2.lua','mt3.lua','mt4.lua'} +local num_files = #files +for i = 1, num_files do + table.insert(files, files[i]) +end +files = shuffle(files) + +for _, f in ipairs(files) do + dofile(f) +end old_teardown() |