tests: more fixes for "cfs_backup" module

Author: Grigory Smolkin

tests/cfs_backup.py

@@ -482,7 +482,7 @@ def test_fullbackup_empty_tablespace_page_after_create_table_stream(self):
         )
 
     # --- Section: Incremental from fill tablespace --- #
-    @unittest.expectedFailure
+    # @unittest.expectedFailure
     # @unittest.skip("skip")
     @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
     def test_fullbackup_after_create_table_ptrack_after_create_table(self):
@@ -546,7 +546,7 @@ def test_fullbackup_after_create_table_ptrack_after_create_table(self):
             )
         )
 
-    @unittest.expectedFailure
+    # @unittest.expectedFailure
     # @unittest.skip("skip")
     @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
     def test_fullbackup_after_create_table_ptrack_after_create_table_stream(self):
@@ -612,7 +612,7 @@ def test_fullbackup_after_create_table_ptrack_after_create_table_stream(self):
             )
         )
 
-    @unittest.expectedFailure
+    # @unittest.expectedFailure
     # @unittest.skip("skip")
     @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
     def test_fullbackup_after_create_table_page_after_create_table(self):
@@ -917,7 +917,7 @@ def test_multiple_segments_in_multiple_tablespaces(self):
             self.node.safe_psql("postgres", "SELECT * FROM t_heap_2"),
             'Lost data after restore')
 
-    @unittest.expectedFailure
+    # @unittest.expectedFailure
     # @unittest.skip("skip")
     @unittest.skipUnless(ProbackupTest.enterprise, 'skip')
     def test_fullbackup_after_create_table_page_after_create_table_stream(self):

tests/helpers/cfs_helpers.py

@@ -88,4 +88,6 @@ def corrupt_file(filename):
 
 def random_string(n):
     a = string.ascii_letters + string.digits
-    return ''.join([random.choice(a) for i in range(int(n)+1)])
+    random_str = ''.join([random.choice(a) for i in range(int(n)+1)])
+    return str.encode(random_str)
+#    return ''.join([random.choice(a) for i in range(int(n)+1)])