fixes in code & tests

Author: funbringer

testgres/cache.py

@@ -59,5 +59,10 @@ def call_initdb(initdb_dir, log=None):
                 # XXX: build new WAL segment with our system id
                 _params = [get_bin_path("pg_resetwal"), "-D", data_dir, "-f"]
                 execute_utility(_params, logfile)
+
+        except ExecUtilException as e:
+            msg = "Failed to reset WAL for system id"
+            raise_from(InitNodeException(msg), e)
+
         except Exception as e:
             raise_from(InitNodeException("Failed to spawn a node"), e)

testgres/utils.py

@@ -76,9 +76,11 @@ def generate_system_id():
     import datetime
     import struct
 
-    date = datetime.datetime.now()
-    secs = int(date.timestamp())
-    usecs = date.microsecond
+    date1 = datetime.datetime.utcfromtimestamp(0)
+    date2 = datetime.datetime.utcnow()
+
+    secs = int((date2 - date1).total_seconds())
+    usecs = date2.microsecond
 
     system_id = 0
     system_id |= (secs << 32)

tests/test_simple.py

@@ -41,7 +41,7 @@
 from testgres.utils import pg_version_ge
 
 
-def util_is_executable(util):
+def util_exists(util):
     def good_properties(f):
         # yapf: disable
         return (os.path.exists(f) and
@@ -91,6 +91,7 @@ def test_init_after_cleanup(self):
             node.cleanup()
             node.init().start().execute('select 1')
 
+    @unittest.skipUnless(util_exists('pg_resetwal'), 'might be missing')
     @unittest.skipUnless(pg_version_ge('9.6'), 'query works on 9.6+')
     def test_init_unique_system_id(self):
         with scoped_config(
@@ -507,7 +508,7 @@ def test_logging(self):
                 master.restart()
                 self.assertTrue(master._logger.is_alive())
 
-    @unittest.skipUnless(util_is_executable('pgbench'), 'might be missing')
+    @unittest.skipUnless(util_exists('pgbench'), 'might be missing')
     def test_pgbench(self):
         with get_new_node().init().start() as node: