From 58067834ad3a72c4aac605ffb2dde0c472305ccf Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Sun, 25 Dec 2016 03:43:03 +0100
Subject: [PATCH] tests: remove TEST_QUIT_ON_TIMEOUT/quit_awesome_on_timeout
 (#1288)

It was set to 1 unconditionally anyway, and does not make sense to parametrize after all.
---
 tests/_runner.lua | 7 +------
 tests/run.sh      | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/_runner.lua b/tests/_runner.lua
index 56860de27..9023a2486 100644
--- a/tests/_runner.lua
+++ b/tests/_runner.lua
@@ -3,8 +3,6 @@ local awful = require("awful")
 
 local runner = {
   quit_awesome_on_error = os.getenv('TEST_PAUSE_ON_ERRORS') ~= '1',
-  -- quit-on-timeout defaults to false: indicates some problem with the test itself.
-  quit_awesome_on_timeout = os.getenv('TEST_QUIT_ON_TIMEOUT') ~= '1',
 }
 
 -- Helpers.
@@ -81,15 +79,12 @@ runner.run_steps = function(steps)
       wait = wait-1
       if wait > 0 then
         t:again()
-        return
       else
         io.stderr:write("Error: timeout waiting for signal in step "
           ..step_as_string..".\n")
         t:stop()
-        if not runner.quit_awesome_on_timeout then
-          return
-        end
       end
+      return
     end
     -- Remove any clients.
     for _,c in ipairs(client.get()) do
diff --git a/tests/run.sh b/tests/run.sh
index 927ad67d8..e6eaa9ce0 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -43,11 +43,9 @@ fi
 if [ "$CI" = true ]; then
     HEADLESS=1
     TEST_PAUSE_ON_ERRORS=0
-    TEST_QUIT_ON_TIMEOUT=1
 else
     HEADLESS=${HEADLESS-0}
     TEST_PAUSE_ON_ERRORS=${TEST_PAUSE_ON_ERRORS-0}
-    TEST_QUIT_ON_TIMEOUT=1
 fi
 export TEST_PAUSE_ON_ERRORS  # Used in tests/_runner.lua.