From 7901a1c6479aea82031c5bbffca07eb7f6567c40 Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Mon, 12 Dec 2016 10:53:01 -0500 Subject: [PATCH] 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. --- tests/_multi_screen.lua | 87 ++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/tests/_multi_screen.lua b/tests/_multi_screen.lua index fab8f3678..d7757f10c 100644 --- a/tests/_multi_screen.lua +++ b/tests/_multi_screen.lua @@ -348,53 +348,58 @@ local colors = { -- Paint it black local function clear_screen() - for s in screen do - local sur = surface.widget_to_surface( - wibox.widget { - bg = "#000000", - widget = wibox.container.background - }, - s.geometry.width, - s.geometry.height - ) - wallpaper.fit(sur, s, "#000000") - end +-- for s in screen do --FIXME very, very slow on Travis +-- local sur = surface.widget_to_surface( +-- wibox.widget { +-- bg = "#000000", +-- widget = wibox.container.background +-- }, +-- s.geometry.width, +-- s.geometry.height +-- ) +-- wallpaper.fit(sur, s, "#000000") +-- end end -- Make it easier to debug the tests by showing the screen geometry when the -- tests are executed. 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 - 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 + --TODO remove this line, all it does it saving some time in the tests until + -- the bug is fixed. + wallpaper.maximized = function() end end local function add_steps(real_steps, new_steps)