[Issue #284] added tests.time_stamp.TimeStamp.test_handling_of_TZ_env_variable

gsmolk · gsmolk · commit 27310b368403 · 2020-12-09T10:50:49.000+03:00
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -707,7 +707,7 @@ def check_ptrack_clean(self, idx_dict, size):
                     )
                 )
 
-    def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, return_id=True):
+    def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, return_id=True, env=None):
         if not self.probackup_old_path and old_binary:
             print('PGPROBACKUPBIN_OLD is not set')
             exit(1)
@@ -717,6 +717,9 @@ def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, retur
         else:
             binary_path = self.probackup_path
 
+        if not env:
+            env=self.test_env
+
         try:
             self.cmd = [' '.join(map(str, [binary_path] + command))]
             if self.verbose:
@@ -728,13 +731,13 @@ def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, retur
                     self.cmd,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
-                    env=self.test_env
+                    env=env
                 )
             else:
                 self.output = subprocess.check_output(
                     [binary_path] + command,
                     stderr=subprocess.STDOUT,
-                    env=self.test_env
+                    env=env
                     ).decode('utf-8')
                 if command[0] == 'backup' and return_id:
                     # return backup ID
@@ -845,7 +848,8 @@ def backup_node(
             self, backup_dir, instance, node, data_dir=False,
             backup_type='full', datname=False, options=[],
             asynchronous=False, gdb=False,
-            old_binary=False, return_id=True, no_remote=False
+            old_binary=False, return_id=True, no_remote=False,
+            env=None
             ):
         if not node and not data_dir:
             print('You must provide ether node or data_dir for backup')
@@ -878,7 +882,7 @@ def backup_node(
         if not old_binary:
             cmd_list += ['--no-sync']
 
-        return self.run_pb(cmd_list + options, asynchronous, gdb, old_binary, return_id)
+        return self.run_pb(cmd_list + options, asynchronous, gdb, old_binary, return_id, env=env)
 
     def checkdb_node(
             self, backup_dir=False, instance=False, data_dir=False,
@@ -942,7 +946,8 @@ def restore_node(
 
     def show_pb(
             self, backup_dir, instance=None, backup_id=None,
-            options=[], as_text=False, as_json=True, old_binary=False
+            options=[], as_text=False, as_json=True, old_binary=False,
+            env=None
             ):
 
         backup_list = []
@@ -963,7 +968,7 @@ def show_pb(
 
         if as_text:
             # You should print it when calling as_text=true
-            return self.run_pb(cmd_list + options, old_binary=old_binary)
+            return self.run_pb(cmd_list + options, old_binary=old_binary, env=env)
 
         # get show result as list of lines
         if as_json:
@@ -988,7 +993,7 @@ def show_pb(
             return backup_list
         else:
             show_splitted = self.run_pb(
-                cmd_list + options, old_binary=old_binary).splitlines()
+                cmd_list + options, old_binary=old_binary, env=env).splitlines()
             if instance is not None and backup_id is None:
                 # cut header(ID, Mode, etc) from show as single string
                 header = show_splitted[1:2][0]
diff --git a/tests/time_stamp.py b/tests/time_stamp.py
@@ -7,7 +7,7 @@
 
 module_name = 'time_stamp'
 
-class CheckTimeStamp(ProbackupTest, unittest.TestCase):
+class TimeStamp(ProbackupTest, unittest.TestCase):
 
     def test_start_time_format(self):
         """Test backup ID changing after start-time editing in backup.control.
@@ -81,6 +81,30 @@ def test_server_date_style(self):
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
+    def test_handling_of_TZ_env_variable(self):
+        """Issue #112"""
+        fname = self.id().split('.')[3]
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
+            set_replication=True,
+            initdb_params=['--data-checksums'])
+
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        node.start()
+
+        my_env = os.environ.copy()
+        my_env["TZ"] = "America/Detroit"
+
+        self.backup_node(
+            backup_dir, 'node', node, options=['--stream', '-j 2'], env=my_env)
+
+        self.show_pb(backup_dir, 'node', env=my_env)
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)
+
     @unittest.skip("skip")
     # @unittest.expectedFailure
     def test_dst_timezone_handling(self):
