[PBCKP-258] fix multiple permission tests

Author: funny-falcon

tests/backup.py

@@ -1902,10 +1902,10 @@ def test_backup_with_least_privileges_role(self):
                 "GRANT EXECUTE ON FUNCTION ptrack.ptrack_init_lsn() TO backup;")
 
         if ProbackupTest.enterprise:
-
             node.safe_psql(
                 "backupdb",
-                "GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup")
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup;"
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;")
 
         # FULL backup
         self.backup_node(

tests/checkdb.py

@@ -669,7 +669,6 @@ def test_checkdb_with_least_privileges(self):
                 'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup;'
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
-                'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
             )
             if ProbackupTest.enterprise:
                 # amcheck-1.1
@@ -710,7 +709,6 @@ def test_checkdb_with_least_privileges(self):
                 'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anyarray, anyelement) TO backup; '
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
-                'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
             )
             # checkunique parameter
             if ProbackupTest.enterprise:
@@ -749,14 +747,19 @@ def test_checkdb_with_least_privileges(self):
                 'GRANT EXECUTE ON FUNCTION pg_catalog.array_position(anycompatiblearray, anycompatible) TO backup; '
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup; '
                 'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup;'
-                'GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup; '
             )
             # checkunique parameter
             if ProbackupTest.enterprise:
                 node.safe_psql(
                     "backupdb",
                     "GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool, bool) TO backup")
 
+        if ProbackupTest.enterprise:
+            node.safe_psql(
+                "backupdb",
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_version() TO backup;"
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pgpro_edition() TO backup;")
+
         # checkdb
         try:
             self.checkdb_node(