Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bzt/modules/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,9 @@ def set_virtual_display(self):
else:
width = self.parameters.get("width", 1024)
height = self.parameters.get("height", 768)
self.virtual_display = Display(size=(width, height))
# -noreset: each reset writes xkbcomp warnings to Xvfb's unread stderr pipe;
# after ~55 resets the pipe fills and Xvfb hangs (MOB-43620)
self.virtual_display = Display(size=(width, height), extra_args=["-noreset"])
self.virtual_display.start()
msg = "Starting virtual display[%s] %s"
self.log.info(msg, (width, height), self.virtual_display.new_display_var)
Expand Down
35 changes: 35 additions & 0 deletions tests/unit/modules/test_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,3 +471,38 @@ def test_jmeter_rampup_benshell_ports(self):
self.log_recorder.info_buff.getvalue())
finally:
self.engine.provisioning.executors = executors


class TestVirtualDisplay(BZTestCase):
def test_xvfb_started_with_noreset(self):
calls = []

class DisplayMock(object):
new_display_var = ":99"

def __init__(self, **kwargs):
calls.append(kwargs)

def start(self):
os.environ["DISPLAY"] = self.new_display_var

orig_display, orig_is_windows = bzt.modules.services.Display, bzt.modules.services.is_windows
old_env = os.environ.get("DISPLAY")
try:
bzt.modules.services.Display = DisplayMock
bzt.modules.services.is_windows = lambda: False
bzt.modules.services.VirtualDisplay.SHARED_VIRTUAL_DISPLAY = None
obj = bzt.modules.services.VirtualDisplay()
obj.engine = EngineEmul()
obj.set_virtual_display()
finally:
bzt.modules.services.Display, bzt.modules.services.is_windows = orig_display, orig_is_windows
bzt.modules.services.VirtualDisplay.SHARED_VIRTUAL_DISPLAY = None
if old_env is None:
os.environ.pop("DISPLAY", None)
else:
os.environ["DISPLAY"] = old_env

self.assertEqual(1, len(calls))
self.assertEqual((1024, 768), calls[0]["size"])
self.assertIn("-noreset", calls[0]["extra_args"])
Loading