tests: Disable the wallpaper for multi-screen tests.

I really try to avoid doing this, psychon too, but enough is
enough. We don't have a solution and I would rather add more
tests that work than keeping a test that keep "failing" just
to remind us it's there.
This commit is contained in:
Emmanuel Lepage Vallee 2016-12-12 10:53:01 -05:00
parent 4b61dbba82
commit 7901a1c647
1 changed files with 46 additions and 41 deletions

View File

@ -348,53 +348,58 @@ local colors = {
-- Paint it black -- Paint it black
local function clear_screen() local function clear_screen()
for s in screen do -- for s in screen do --FIXME very, very slow on Travis
local sur = surface.widget_to_surface( -- local sur = surface.widget_to_surface(
wibox.widget { -- wibox.widget {
bg = "#000000", -- bg = "#000000",
widget = wibox.container.background -- widget = wibox.container.background
}, -- },
s.geometry.width, -- s.geometry.width,
s.geometry.height -- s.geometry.height
) -- )
wallpaper.fit(sur, s, "#000000") -- wallpaper.fit(sur, s, "#000000")
end -- end
end end
-- Make it easier to debug the tests by showing the screen geometry when the -- Make it easier to debug the tests by showing the screen geometry when the
-- tests are executed. -- tests are executed.
local function show_screens() local function show_screens()
wallpaper.set(color("#000000")) -- Should this clear the wallpaper? It doesn't --FIXME very, very slow on Travis
-- wallpaper.set(color("#000000")) -- Should this clear the wallpaper? It doesn't
--
-- -- Add a wallpaper on each screen
-- for i=1, screen.count() do
-- local s = screen[i]
--
-- local w = wibox.widget {
-- {
-- text = table.concat{
-- "Screen: ",i,"\n",
-- s.geometry.width,"x",s.geometry.height,
-- "+",s.geometry.x,",",s.geometry.y
-- },
-- valign = "center",
-- align = "center",
-- widget = wibox.widget.textbox,
-- },
-- bg = colors[i],
-- fg = "#ffffff",
-- shape_border_color = "#ff0000",
-- shape_border_width = 1,
-- shape = shape.rectangle,
-- widget = wibox.container.background
-- }
-- local sur = surface.widget_to_surface(
-- w,
-- s.geometry.width,
-- s.geometry.height
-- )
-- wallpaper.fit(sur, s)
-- end
-- Add a wallpaper on each screen --TODO remove this line, all it does it saving some time in the tests until
for i=1, screen.count() do -- the bug is fixed.
local s = screen[i] wallpaper.maximized = function() end
local w = wibox.widget {
{
text = table.concat{
"Screen: ",i,"\n",
s.geometry.width,"x",s.geometry.height,
"+",s.geometry.x,",",s.geometry.y
},
valign = "center",
align = "center",
widget = wibox.widget.textbox,
},
bg = colors[i],
fg = "#ffffff",
shape_border_color = "#ff0000",
shape_border_width = 1,
shape = shape.rectangle,
widget = wibox.container.background
}
local sur = surface.widget_to_surface(
w,
s.geometry.width,
s.geometry.height
)
wallpaper.fit(sur, s)
end
end end
local function add_steps(real_steps, new_steps) local function add_steps(real_steps, new_steps)