[Test] Extend & enable combined milter test

diff --git a/test/functional/cases/180_milter.robot b/test/functional/cases/180_milter.robot
index 6e8f0c36497f9283d9bdb1c5a57a589488625fdd..814fd0de51936b7ed8a020b027d6e2cd25982b94 100644 (file)
--- 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 891929458d74724004e3d0a3133a5461215d7fb6..964fa878a59d13b4343801715af1666bd7ac3b46 100644 (file)
--- 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()