awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Hahler 2016-12-25 03:43:03 +01:00 committed by GitHub
parent fd1a622b5f
commit 58067834ad
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/_runner.lua
View File

@ -3,8 +3,6 @@ local awful = require("awful")
local runner = { local runner = {
quit_awesome_on_error = os.getenv('TEST_PAUSE_ON_ERRORS') ~= '1', 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. -- Helpers.
@ -81,15 +79,12 @@ runner.run_steps = function(steps)
wait = wait-1 wait = wait-1
if wait > 0 then if wait > 0 then
t:again() t:again()
return
else else
io.stderr:write("Error: timeout waiting for signal in step " io.stderr:write("Error: timeout waiting for signal in step "
..step_as_string..".\n") ..step_as_string..".\n")
t:stop() t:stop()
if not runner.quit_awesome_on_timeout then
return
end
end end
return
end end
-- Remove any clients. -- Remove any clients.
for _,c in ipairs(client.get()) do for _,c in ipairs(client.get()) do

2
tests/run.sh
View File

@ -43,11 +43,9 @@ fi
if [ "$CI" = true ]; then if [ "$CI" = true ]; then
HEADLESS=1 HEADLESS=1
TEST_PAUSE_ON_ERRORS=0 TEST_PAUSE_ON_ERRORS=0
TEST_QUIT_ON_TIMEOUT=1
else else
HEADLESS=${HEADLESS-0} HEADLESS=${HEADLESS-0}
TEST_PAUSE_ON_ERRORS=${TEST_PAUSE_ON_ERRORS-0} TEST_PAUSE_ON_ERRORS=${TEST_PAUSE_ON_ERRORS-0}
TEST_QUIT_ON_TIMEOUT=1
fi fi
export TEST_PAUSE_ON_ERRORS # Used in tests/_runner.lua. export TEST_PAUSE_ON_ERRORS # Used in tests/_runner.lua.