PGPRO-1376 tests: new test case added

Author: gsmolk

tests/backup_test.py

@@ -442,20 +442,58 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
             tblspc_path=(os.path.join(node.data_dir, 'pg_clog', '100500'))
             )
 
+        self.create_tblspace_in_node(
+            node, 'tblspace2',
+            tblspc_path=(os.path.join(node.data_dir))
+            )
+
+        node.safe_psql(
+            "postgres",
+            "create table t_heap1 tablespace tblspace1 as select 1 as id, "
+            "md5(i::text) as text, "
+            "md5(repeat(i::text,10))::tsvector as tsvector "
+            "from generate_series(0,1000) i")
+
         node.safe_psql(
             "postgres",
-            "create table t_heap tablespace tblspace1 as select 1 as id, "
+            "create table t_heap2 tablespace tblspace2 as select 1 as id, "
             "md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
             "from generate_series(0,1000) i")
 
+        try:
+            self.backup_node(
+                backup_dir, 'node', node, backup_type="full",
+                options=["-j", "4", "--stream"])
+            # we should die here because exception is what we expect to happen
+            self.assertEqual(
+                1, 0,
+                "Expecting Error because of too many levels "
+                "of symbolic linking\n"
+                " Output: {0} \n CMD: {1}".format(
+                    repr(self.output), self.cmd))
+        except ProbackupException as e:
+            self.assertTrue(
+                'Too many levels of symbolic links' in e.message,
+                "\n Unexpected Error Message: {0}\n CMD: {1}".format(
+                    repr(e.message), self.cmd))
+
+        node.safe_psql(
+            "postgres",
+            "drop table t_heap2")
+        node.safe_psql(
+            "postgres",
+            "drop tablespace tblspace2")
+
         self.backup_node(
-            backup_dir, 'node', node, backup_type="full",
-            options=["-j", "4", "--stream"])
+                backup_dir, 'node', node, backup_type="full",
+                options=["-j", "4", "--stream"])
+
+        pgdata = self.pgdata_content(node.data_dir)
 
         relfilenode = node.safe_psql(
             "postgres",
-            "select 't_heap'::regclass::oid"
+            "select 't_heap1'::regclass::oid"
             ).rstrip()
 
         list = []
@@ -475,3 +513,12 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
                 "Following file copied twice by backup:\n {0}".format(
                     message)
                 )
+
+        node.cleanup()
+
+        self.restore_node(
+            backup_dir, 'node', node, options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)

tests/helpers/ptrack_helpers.py

@@ -259,7 +259,9 @@ def create_tblspace_in_node(self, node, tblspc_name, tblspc_path=None, cfs=False
             tblspc_name, tblspc_path)
         if cfs:
             cmd += " with (compression=true)"
-        os.makedirs(tblspc_path)
+
+        if not os.path.exists(tblspc_path):
+            os.makedirs(tblspc_path)
         res = node.safe_psql("postgres", cmd)
         # Check that tablespace was successfully created
         # self.assertEqual(