Don't use the pg_am system catalog in new test

This causes deadlocks because it's a highly trafficked catalog.  Use a
regular table created by the same test instead.

Discussion: https://postgr.es/m/[email protected]

2 files changed, 3 insertions, 3 deletions

diff --git a/src/test/regress/expected/create_am.out b/src/test/regress/expected/create_am.out
index aa4cb4fa77f..9762c332ce0 100644
--- a/src/test/regress/expected/create_am.out
+++ b/src/test/regress/expected/create_am.out
@@ -548,8 +548,8 @@ ERROR:  access method "I do not exist AM" does not exist
 CREATE TABLE i_am_a_failure() USING "btree";
 ERROR:  access method "btree" is not of type TABLE
 -- Other weird invalid cases that cause problems
-CREATE FOREIGN TABLE fp PARTITION OF pg_am DEFAULT SERVER x;
-ERROR:  "pg_am" is not partitioned
+CREATE FOREIGN TABLE fp PARTITION OF tableam_parted_a_heap2 DEFAULT SERVER x;
+ERROR:  "tableam_parted_a_heap2" is not partitioned
 -- Drop table access method, which fails as objects depends on it
 DROP ACCESS METHOD heap2;
 ERROR:  cannot drop access method heap2 because other objects depend on it
diff --git a/src/test/regress/sql/create_am.sql b/src/test/regress/sql/create_am.sql
index c57a87da4b9..825aed325e5 100644
--- a/src/test/regress/sql/create_am.sql
+++ b/src/test/regress/sql/create_am.sql
@@ -349,7 +349,7 @@ CREATE TABLE i_am_a_failure() USING "I do not exist AM";
 CREATE TABLE i_am_a_failure() USING "btree";
 
 -- Other weird invalid cases that cause problems
-CREATE FOREIGN TABLE fp PARTITION OF pg_am DEFAULT SERVER x;
+CREATE FOREIGN TABLE fp PARTITION OF tableam_parted_a_heap2 DEFAULT SERVER x;
 
 -- Drop table access method, which fails as objects depends on it
 DROP ACCESS METHOD heap2;