Stabilize tests.checkdb.CheckdbTest.test_checkdb_with_least_privileges: accounting differences in amcheck versions in various editions of PG-10 (bd81f7f follow-up)

kulaginm · kulaginm · commit fc752c89026e · 2021-10-18T05:51:12.000+03:00
diff --git a/tests/checkdb.py b/tests/checkdb.py
@@ -621,9 +621,18 @@ def test_checkdb_with_least_privileges(self):
                 'GRANT EXECUTE ON FUNCTION pg_catalog.oideq(oid, oid) TO backup; '
                 'GRANT EXECUTE ON FUNCTION pg_catalog.charne("char", "char") TO backup; '
                 'GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; '
-                'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; '
-                'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup;'
+                'GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup;'
             )
+            if ProbackupTest.enterprise:
+                # amcheck-1.1
+                node.safe_psql(
+                    'backupdb',
+                    'GRANT EXECUTE ON FUNCTION bt_index_check(regclass, bool) TO backup')
+            else:
+                # amcheck-1.0
+                node.safe_psql(
+                    'backupdb',
+                    'GRANT EXECUTE ON FUNCTION bt_index_check(regclass) TO backup')
         # >= 11
         else:
             node.safe_psql(
