diff options
| author | Andres Freund <andres@anarazel.de> | 2020-06-14 11:47:37 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2020-07-08 12:39:56 -0700 |
| commit | 229f8c219f8fffacc253eca6023eab10a16eb009 (patch) | |
| tree | 5c3df9c9ad633caa94566aaa620b126189f97126 /src/bin/pg_rewind/t/002_databases.pl | |
| parent | 2661a793ff59149af1d844d6be504e421c04733e (diff) | |
| download | postgresql-229f8c219f8fffacc253eca6023eab10a16eb009.tar.gz postgresql-229f8c219f8fffacc253eca6023eab10a16eb009.zip | |
tap tests: replace 'master' with 'primary'.
We've largely replaced master with primary in docs etc, but tap test
still widely used master.
Author: Andres Freund
Reviewed-By: David Steele
Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de
Diffstat (limited to 'src/bin/pg_rewind/t/002_databases.pl')
| -rw-r--r-- | src/bin/pg_rewind/t/002_databases.pl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl index 1db534c0dc0..5506fe425bc 100644 --- a/src/bin/pg_rewind/t/002_databases.pl +++ b/src/bin/pg_rewind/t/002_databases.pl @@ -13,26 +13,26 @@ sub run_test my $test_mode = shift; RewindTest::setup_cluster($test_mode, ['-g']); - RewindTest::start_master(); + RewindTest::start_primary(); - # Create a database in master with a table. - master_psql('CREATE DATABASE inmaster'); - master_psql('CREATE TABLE inmaster_tab (a int)', 'inmaster'); + # Create a database in primary with a table. + primary_psql('CREATE DATABASE inprimary'); + primary_psql('CREATE TABLE inprimary_tab (a int)', 'inprimary'); RewindTest::create_standby($test_mode); # Create another database with another table, the creation is # replicated to the standby. - master_psql('CREATE DATABASE beforepromotion'); - master_psql('CREATE TABLE beforepromotion_tab (a int)', + primary_psql('CREATE DATABASE beforepromotion'); + primary_psql('CREATE TABLE beforepromotion_tab (a int)', 'beforepromotion'); RewindTest::promote_standby(); - # Create databases in the old master and the new promoted standby. - master_psql('CREATE DATABASE master_afterpromotion'); - master_psql('CREATE TABLE master_promotion_tab (a int)', - 'master_afterpromotion'); + # Create databases in the old primary and the new promoted standby. + primary_psql('CREATE DATABASE primary_afterpromotion'); + primary_psql('CREATE TABLE primary_promotion_tab (a int)', + 'primary_afterpromotion'); standby_psql('CREATE DATABASE standby_afterpromotion'); standby_psql('CREATE TABLE standby_promotion_tab (a int)', 'standby_afterpromotion'); @@ -45,7 +45,7 @@ sub run_test check_query( 'SELECT datname FROM pg_database ORDER BY 1', qq(beforepromotion -inmaster +inprimary postgres standby_afterpromotion template0 @@ -59,7 +59,7 @@ template1 skip "unix-style permissions not supported on Windows", 1 if ($windows_os); - ok(check_mode_recursive($node_master->data_dir(), 0750, 0640), + ok(check_mode_recursive($node_primary->data_dir(), 0750, 0640), 'check PGDATA permissions'); } |