xvfbwrapper 0.2.27__tar.gz → 0.2.29__tar.gz

{xvfbwrapper-0.2.27/xvfbwrapper.egg-info → xvfbwrapper-0.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xvfbwrapper
-Version: 0.2.27
+Version: 0.2.29
 Summary: Manage headless displays with Xvfb (X virtual framebuffer)
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -164,7 +164,7 @@ xvfb.start()
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(display=23)
-xvfb.start() # Xvfb will start on display :23
+xvfb.start()  # Xvfb will start on display :23
 ```
 
 #### Setting XDG_SESSION_TYPE:
@@ -194,7 +194,7 @@ creating an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(nolisten="tcp")
-xvfb.start() # Xvfb will be called with the `-nolisten tcp` argument
+xvfb.start()  # Xvfb will be called with the `-nolisten tcp` argument
 ```
 
 However, there are other possible types of arguments:
@@ -212,7 +212,7 @@ an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(extra_args=("ttyxx", "-nocursor", "+extension", "RANDR"))
-xvfb.start() # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
+xvfb.start()  # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
 ```
 
 #### Multithreaded execution:
@@ -260,7 +260,6 @@ from xvfbwrapper import Xvfb
 
 
 class TestPage(unittest.TestCase):
-
     def setUp(self):
         xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()

{xvfbwrapper-0.2.27 → xvfbwrapper-0.2.29}/README.md

@@ -133,7 +133,7 @@ xvfb.start()
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(display=23)
-xvfb.start() # Xvfb will start on display :23
+xvfb.start()  # Xvfb will start on display :23
 ```
 
 #### Setting XDG_SESSION_TYPE:
@@ -163,7 +163,7 @@ creating an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(nolisten="tcp")
-xvfb.start() # Xvfb will be called with the `-nolisten tcp` argument
+xvfb.start()  # Xvfb will be called with the `-nolisten tcp` argument
 ```
 
 However, there are other possible types of arguments:
@@ -181,7 +181,7 @@ an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(extra_args=("ttyxx", "-nocursor", "+extension", "RANDR"))
-xvfb.start() # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
+xvfb.start()  # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
 ```
 
 #### Multithreaded execution:
@@ -229,7 +229,6 @@ from xvfbwrapper import Xvfb
 
 
 class TestPage(unittest.TestCase):
-
     def setUp(self):
         xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()

{xvfbwrapper-0.2.27 → xvfbwrapper-0.2.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "xvfbwrapper"
-version = "0.2.27"
+version = "0.2.29"
 description = "Manage headless displays with Xvfb (X virtual framebuffer)"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -52,9 +52,7 @@ type = [
     "types-psutil",
 ]
 validate = [
-    "packaging",
-    "tomli",
-    "validate-pyproject",
+    "validate-pyproject[all]",
 ]
 
 [tool.setuptools]

{xvfbwrapper-0.2.27 → xvfbwrapper-0.2.29}/test_xvfb.py

@@ -21,9 +21,6 @@ class XvfbCleanTestCase(unittest.TestCase):
 
     - Records existing Xvfb processes at class start.
     - Kills newly spawned Xvfb processes at class end.
-
-    - Records existing Xvfb processes at test start.
-    - Kills newly spawned Xvfb processes at test end.
     """
 
     # ---------- Utility ----------
@@ -269,7 +266,8 @@ class TestXvfb(XvfbCleanTestCase):
         self.assertEqual(xvfb.new_display, display_num)
         self.assertIsNotNone(xvfb.proc)
         with self.assertRaisesRegex(
-            RuntimeError, f"Could not lock display :{display_num}"
+            RuntimeError,
+            f"Could not lock display :{display_num}",
         ):
             xvfb2.start()
 
@@ -348,17 +346,30 @@ class TestXvfb(XvfbCleanTestCase):
     def test_environ_keyword_isolates_environment_modification(self):
         # Check that start and stop methods modified the environ dict if
         # passed and does not modify os.environ
-        env_duped = os.environ.copy()
-        xvfb = Xvfb(environ=env_duped)
+        custom_env = os.environ.copy()
+        xvfb = Xvfb(environ=custom_env)
         xvfb.start()
         new_display = f":{xvfb.new_display}"
         self.assertEqual(":0", os.environ["DISPLAY"])
-        self.assertEqual(new_display, env_duped["DISPLAY"])
+        self.assertEqual(new_display, custom_env["DISPLAY"])
         xvfb.stop()
         self.assertEqual(":0", os.environ["DISPLAY"])
-        self.assertEqual(":0", env_duped["DISPLAY"])
+        self.assertEqual(":0", custom_env["DISPLAY"])
         self.assertIsNone(xvfb.proc)
 
+    def test_environ_is_passed_to_xvfb_subprocess(self):
+        marker_value = "xvfbwrapper_test_marker_12345"
+        custom_env = os.environ.copy()
+        custom_env["XVFBWRAPPER_TEST_MARKER"] = marker_value
+        xvfb = Xvfb(environ=custom_env)
+        self.addCleanup(xvfb.stop)
+        xvfb.start()
+        proc = psutil.Process(xvfb.proc.pid)
+        self.assertEqual(
+            proc.environ().get("XVFBWRAPPER_TEST_MARKER"),
+            marker_value,
+        )
+
     def test_start_failure_without_initial_display_env(self):
         # Provide a custom env *without* DISPLAY so orig_display_var == None
         custom_env = {"PATH": os.environ.get("PATH", "")}
@@ -378,7 +389,8 @@ class TestXvfb(XvfbCleanTestCase):
         with (
             patch.object(xvfb, "_local_display_exists", return_value=False),
             self.assertRaisesRegex(
-                RuntimeError, f"Xvfb display did not open: {expected_cmd_args}"
+                RuntimeError,
+                f"Xvfb display did not open: {expected_cmd_args}",
             ),
         ):
             xvfb.start()

{xvfbwrapper-0.2.27 → xvfbwrapper-0.2.29/xvfbwrapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xvfbwrapper
-Version: 0.2.27
+Version: 0.2.29
 Summary: Manage headless displays with Xvfb (X virtual framebuffer)
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -164,7 +164,7 @@ xvfb.start()
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(display=23)
-xvfb.start() # Xvfb will start on display :23
+xvfb.start()  # Xvfb will start on display :23
 ```
 
 #### Setting XDG_SESSION_TYPE:
@@ -194,7 +194,7 @@ creating an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(nolisten="tcp")
-xvfb.start() # Xvfb will be called with the `-nolisten tcp` argument
+xvfb.start()  # Xvfb will be called with the `-nolisten tcp` argument
 ```
 
 However, there are other possible types of arguments:
@@ -212,7 +212,7 @@ an `xvfbwrapper.Xvfb` instance. For example:
 from xvfbwrapper import Xvfb
 
 xvfb = Xvfb(extra_args=("ttyxx", "-nocursor", "+extension", "RANDR"))
-xvfb.start() # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
+xvfb.start()  # Xvfb will be called with the `ttyxx -nocursor +extension RANDR` arguments
 ```
 
 #### Multithreaded execution:
@@ -260,7 +260,6 @@ from xvfbwrapper import Xvfb
 
 
 class TestPage(unittest.TestCase):
-
     def setUp(self):
         xvfb = Xvfb(set_xdg_session_type=True)
         xvfb.start()

{xvfbwrapper-0.2.27 → xvfbwrapper-0.2.29}/xvfbwrapper.py

@@ -111,6 +111,7 @@ class Xvfb:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             close_fds=True,
+            env=dict(self.environ),
         )
         start = time.time()
         while not self._local_display_exists(self.new_display):