merge master

v.shepard · v.shepard · commit 0da2ee2fbd95 · 2023-06-06T13:44:15.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 testgres is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
 
-Copyright (c) 2016-2018, Postgres Professional
+Copyright (c) 2016-2023, Postgres Professional
 
 Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -19,7 +19,7 @@
 # -- Project information -----------------------------------------------------
 
 project = u'testgres'
-copyright = u'2016-2022, Postgres Professional'
+copyright = u'2016-2023, Postgres Professional'
 author = u'Postgres Professional'
 
 # The short X.Y version
diff --git a/publish_package.sh b/publish_package.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2017-2022 Postgres Professional
-
 set -eux
 
 # prepare environment
@@ -21,3 +19,4 @@ python3 setup.py sdist bdist_wheel
 twine upload dist/*
 
 set +eux
+
diff --git a/run_tests.sh b/run_tests.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2017-2022 Postgres Professional
+# Copyright (c) 2017-2023 Postgres Professional
 
 set -eux
 
diff --git a/setup.py b/setup.py
@@ -6,7 +6,13 @@
     from distutils.core import setup
 
 # Basic dependencies
-install_requires = ["pg8000", "port-for>=0.4", "six>=1.9.0", "psutil", "fabric"]
+install_requires = [
+    "pg8000",
+    "port-for>=0.4",
+    "six>=1.9.0",
+    "psutil",
+    "packaging",
+]
 
 # Add compatibility enum class
 if sys.version_info < (3, 4):
diff --git a/testgres/node.py b/testgres/node.py
@@ -116,6 +116,7 @@ class ProcessProxy(object):
         process: wrapped psutill.Process object
         ptype: instance of ProcessType
     """
+
     def __init__(self, process, ptype=None):
         self.process = process
         self.ptype = ptype or ProcessType.from_process(process)
@@ -710,12 +711,12 @@ def start(self, params=[], wait=True):
             return self
 
         _params = [
-                      get_bin_path("pg_ctl"),
-                      "-D", self.data_dir,
-                      "-l", self.pg_log_file,
-                      "-w" if wait else '-W',  # --wait or --no-wait
-                      "start"
-                  ] + params  # yapf: disable
+            get_bin_path("pg_ctl"),
+            "-D", self.data_dir,
+            "-l", self.pg_log_file,
+            "-w" if wait else '-W',  # --wait or --no-wait
+            "start"
+        ] + params  # yapf: disable
 
         try:
             execute_utility(_params, self.utils_log_file)
@@ -765,7 +766,7 @@ def kill(self, someone=None):
             """
         if self.is_started:
             sig = signal.SIGKILL if os.name != 'nt' else signal.SIGBREAK
-            if someone == None:
+            if someone is None:
                 os.kill(self.pid, sig)
             else:
                 os.kill(self.auxiliary_pids[someone][0], sig)
@@ -1509,10 +1510,10 @@ def querier():
         return sum
 
     def pgbench_table_checksums(self, dbname="postgres",
-                                pgbench_tables = ('pgbench_branches',
-                                                  'pgbench_tellers',
-                                                  'pgbench_accounts',
-                                                  'pgbench_history')
+                                pgbench_tables=('pgbench_branches',
+                                                'pgbench_tellers',
+                                                'pgbench_accounts',
+                                                'pgbench_history')
                                 ):
         return {(table, self.table_checksum(table, dbname))
                 for table in pgbench_tables}
diff --git a/testgres/utils.py b/testgres/utils.py
@@ -12,7 +12,10 @@
 
 from contextlib import contextmanager
 from packaging.version import Version
-from distutils.spawn import find_executable
+try:
+    from shutil import which as find_executable
+except ImportError:
+    from distutils.spawn import find_executable
 from six import iteritems
 
 from fabric import Connection
diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -171,8 +171,8 @@ def test_node_exit(self):
     def test_double_start(self):
         with get_new_node().init().start() as node:
             # can't start node more than once
-            with self.assertRaises(StartNodeException):
-                node.start()
+            node.start()
+            self.assertTrue(node.is_started)
 
     def test_uninitialized_start(self):
         with get_new_node() as node:
