tests/conftest: move suspend_tree/resume_tree into LabgridComponent

Previously only tests/test_client.py could use the suspend_tree() and
resume_tree() functionality. Since this is also useful for
exporter + coordinator tests, move it into the generic LabgridComponent
class.

Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

tests/conftest.py

@@ -11,6 +11,8 @@
 from labgrid.resource import RawSerialPort, NetworkSerialPort
 from labgrid.driver.fake import FakeConsoleDriver
 
+psutil = pytest.importorskip("psutil")
+
 @pytest.fixture(scope="session")
 def curses_init():
     """ curses only reads the terminfo DB once on the first import, so make
@@ -104,6 +106,18 @@ def exitstatus(self):
     def pid(self):
         return self.spawn.pid
 
+    def suspend_tree(self):
+        main = psutil.Process(self.pid)
+        main.suspend()
+        for child in main.children(recursive=True):
+            child.suspend()
+
+    def resume_tree(self):
+        main = psutil.Process(self.pid)
+        main.resume()
+        for child in main.children(recursive=True):
+            child.resume()
+
 
 class Exporter(LabgridComponent):
     def __init__(self, config, cwd):

tests/test_client.py

@@ -5,20 +5,6 @@
 import pytest
 import pexpect
 
-psutil = pytest.importorskip("psutil")
-
-def suspend_tree(pid):
-    main = psutil.Process(pid)
-    main.suspend()
-    for child in main.children(recursive=True):
-        child.suspend()
-
-def resume_tree(pid):
-    main = psutil.Process(pid)
-    main.resume()
-    for child in main.children(recursive=True):
-        child.resume()
-
 def test_startup(coordinator):
     pass
 
@@ -68,15 +54,15 @@ def test_connect_error():
         assert spawn.exitstatus == 1, spawn.before.strip()
 
 def test_connect_timeout(coordinator):
-    suspend_tree(coordinator.pid)
+    coordinator.suspend_tree()
     try:
         with pexpect.spawn('python -m labgrid.remote.client places') as spawn:
             spawn.expect("connection attempt timed out before receiving SETTINGS frame")
             spawn.expect(pexpect.EOF)
             spawn.close()
             assert spawn.exitstatus == 1, spawn.before.strip()
     finally:
-        resume_tree(coordinator.pid)
+        coordinator.resume_tree()
         pass
 
 def test_place_show(place):
@@ -488,7 +474,7 @@ def test_exporter_timeout(place, exporter):
         spawn.close()
         assert spawn.exitstatus == 0, spawn.before.strip()
 
-    suspend_tree(exporter.pid)
+    exporter.suspend_tree()
     try:
         time.sleep(30)
 
@@ -499,7 +485,7 @@ def test_exporter_timeout(place, exporter):
             assert spawn.exitstatus == 0, spawn.before.strip()
             assert b'/Testport/NetworkSerialPort' not in spawn.before
     finally:
-        resume_tree(exporter.pid)
+        exporter.resume_tree()
 
     # the exporter should quit by itself now
     time.sleep(5)

tests/test_coordinator.py

@@ -4,8 +4,6 @@
 import labgrid.remote.generated.labgrid_coordinator_pb2_grpc as labgrid_coordinator_pb2_grpc
 import labgrid.remote.generated.labgrid_coordinator_pb2 as labgrid_coordinator_pb2
 
-psutil = pytest.importorskip("psutil")
-
 @pytest.fixture(scope='function')
 def channel_stub():
     import queue