Changeset 573b810 in mod_gnutls

Timestamp:

Jan 9, 2020, 2:47:21 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

7e10018

Parents:

278381d

Message:

mgstest.services: Use pathlib and conditional expressions

Just a minor simplification.

File:

• test/mgstest/services.py (modified) (7 diffs)

test/mgstest/services.py

@@ -17 +17 @@
 import errno
 import os
-import os.path
 import signal
 import subprocess
@@ -23 +22 @@
 
 from contextlib import contextmanager
+from pathlib import Path
 from time import sleep
 
@@ -37 +37 @@
         self.forking = forking
         # condition: start service if the function returns true
-        if condition:
-            self.condition = condition
-        else:
-            self.condition = lambda: True
+        self.condition = condition or (lambda: True)
 
         # child process for non-forking services
@@ -46 +43 @@
         # Forking processes like apache2 require a PID file for
         # tracking. The process must delete its PID file when exiting.
-        self.pidfile = pidfile
+        self.pidfile = Path(pidfile) if pidfile else None
         if not self.pidfile and self.forking:
             raise ValueError('Forking service must provide PID file!')
@@ -86 +83 @@
         # Read PID file before actually sending the stop signal
         if self.pidfile:
-            if not os.path.exists(self.pidfile):
+            if not self.pidfile.exists():
                 print(f'Skipping stop of {self.stop_command}, no PID file!')
                 # Presumably the process isn't running, ignore.
                 return
-            with open(self.pidfile, 'r') as file:
-                self.pid = int(file.read())
+            self.pid = int(self.pidfile.read_text())
         if self.stop_command:
             print(f'Stopping: {self.stop_command}')
@@ -170 +166 @@
 
     def __init__(self, config, env=None, pidfile=None, check=None):
-        self.config = os.path.realpath(config)
+        self.config = Path(config).resolve()
         base_cmd = [self.apache2, '-f', str(self.config), '-k']
         if not check:
@@ -183 +179 @@
 
     def config_exists(self):
-        return os.path.isfile(self.config)
+        return self.config.is_file()
 
     def pidfile_check(self):
         """Default check method for ApacheService, waits for the PID file to
         be present."""
-        return os.path.exists(self.pidfile)
+        return self.pidfile.is_file()