Add support secondary arguments support to load_ui

Dockerfile

@@ -7,21 +7,16 @@ RUN apt-get update && apt-get install -y \
     xvfb
 
 # Nose is the Python test-runner
-RUN pip install nose nosepipe
+RUN pip install nose nosepipe xvfbwrapper
 
 # Enable additional output from Qt.py
 ENV QT_VERBOSE true
 
-# Xvfb
-ENV DISPLAY :99
-
 WORKDIR /workspace/Qt.py
 ENTRYPOINT cp -r /Qt.py /workspace && \
 	python build_caveats_tests.py && \
-	Xvfb :99 -screen 0 1024x768x16 & \
-	sleep 3 && \
 	nosetests \
 		--verbose \
 		--with-process-isolation \
 		--with-doctest \
-		--exe 
+		--exe

tests.py

@@ -34,6 +34,18 @@ def pyside():
     os.environ.pop("QT_PREFERRED_BINDING")
 
 
+@contextlib.contextmanager
+def xvfb():
+    from xvfbwrapper import Xvfb
+
+    vdisplay = Xvfb()
+    vdisplay.start()
+
+    yield
+
+    # vdisplay.stop()
+
+
 @contextlib.contextmanager
 def ui():
     source = """\
@@ -219,67 +231,71 @@ def test_vendoring():
 def test_load_ui_into_self_pyside():
     """load_ui: Load widgets into self using PySide"""
 
-    with ui() as fname:
-        with pyside():
-            from Qt import QtWidgets, load_ui
+    with xvfb():
+        with ui() as fname:
+            with pyside():
+                from Qt import QtWidgets, load_ui
 
-            class MainWindow(QtWidgets.QMainWindow):
-                def __init__(self, parent=None):
-                    QtWidgets.QMainWindow.__init__(self, parent)
-                    load_ui(fname, self)
+                class MainWindow(QtWidgets.QMainWindow):
+                    def __init__(self, parent=None):
+                        QtWidgets.QMainWindow.__init__(self, parent)
+                        load_ui(fname, self)
 
-            app = QtWidgets.QApplication(sys.argv)
-            window = MainWindow()
+                app = QtWidgets.QApplication(sys.argv)
+                window = MainWindow()
 
-            # Inherited from .ui file
-            assert hasattr(window, "pushButton")
+                # Inherited from .ui file
+                assert hasattr(window, "pushButton")
 
 
 def test_load_ui_into_self_pyqt4():
     """load_ui: Load widgets into self using PyQt4"""
 
-    with ui() as fname:
-        with pyqt4():
-            from Qt import QtWidgets, load_ui
+    with xvfb():
+        with ui() as fname:
+            with pyqt4():
+                from Qt import QtWidgets, load_ui
 
-            class MainWindow(QtWidgets.QMainWindow):
-                def __init__(self, parent=None):
-                    QtWidgets.QMainWindow.__init__(self, parent)
-                    load_ui(fname, self)
+                class MainWindow(QtWidgets.QMainWindow):
+                    def __init__(self, parent=None):
+                        QtWidgets.QMainWindow.__init__(self, parent)
+                        load_ui(fname, self)
 
-            app = QtWidgets.QApplication(sys.argv)
-            window = MainWindow()
+                app = QtWidgets.QApplication(sys.argv)
+                window = MainWindow()
 
-            # Inherited from .ui file
-            assert hasattr(window, "pushButton")
+                # Inherited from .ui file
+                assert hasattr(window, "pushButton")
 
 
 def test_load_ui_into_custom_pyside():
-    """load_ui: Load .ui file"""
+    """load_ui: Load .ui file into custom using PySide"""
 
-    with ui() as fname:
-        with pyside():
-            from Qt import QtWidgets, load_ui
+    with xvfb():
+        with ui() as fname:
+            with pyside():
+                from Qt import QtWidgets, load_ui
 
-            app = QtWidgets.QApplication(sys.argv)
-            widget = load_ui(fname)
+                app = QtWidgets.QApplication(sys.argv)
+                widget = load_ui(fname)
 
-            # From .ui file
-            assert hasattr(widget, "pushButton")
+                # From .ui file
+                assert hasattr(widget, "pushButton")
 
 
 def test_load_ui_into_custom_pyqt4():
     """load_ui: Load widgets into custom using PyQt4"""
 
-    with ui() as fname:
-        with pyqt4():
-            from Qt import QtWidgets, load_ui
+    with xvfb():
+        with ui() as fname:
+            with pyqt4():
+                from Qt import QtWidgets, load_ui
 
-            app = QtWidgets.QApplication(sys.argv)
-            widget = load_ui(fname)
+                app = QtWidgets.QApplication(sys.argv)
+                widget = load_ui(fname)
 
-            # From .ui file
-            assert hasattr(widget, "pushButton")
+                # From .ui file
+                assert hasattr(widget, "pushButton")
 
 
 if PYTHON == 2: