diff options
Diffstat (limited to 'src/bin/pg_rewind/t/003_extrafiles.pl')
| -rw-r--r-- | src/bin/pg_rewind/t/003_extrafiles.pl | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl index f4710440fc3..48849fb49aa 100644 --- a/src/bin/pg_rewind/t/003_extrafiles.pl +++ b/src/bin/pg_rewind/t/003_extrafiles.pl @@ -18,21 +18,21 @@ sub run_test my $test_mode = shift; RewindTest::setup_cluster($test_mode); - RewindTest::start_master(); + RewindTest::start_primary(); - my $test_master_datadir = $node_master->data_dir; + my $test_primary_datadir = $node_primary->data_dir; # Create a subdir and files that will be present in both - mkdir "$test_master_datadir/tst_both_dir"; - append_to_file "$test_master_datadir/tst_both_dir/both_file1", "in both1"; - append_to_file "$test_master_datadir/tst_both_dir/both_file2", "in both2"; - mkdir "$test_master_datadir/tst_both_dir/both_subdir/"; - append_to_file "$test_master_datadir/tst_both_dir/both_subdir/both_file3", + mkdir "$test_primary_datadir/tst_both_dir"; + append_to_file "$test_primary_datadir/tst_both_dir/both_file1", "in both1"; + append_to_file "$test_primary_datadir/tst_both_dir/both_file2", "in both2"; + mkdir "$test_primary_datadir/tst_both_dir/both_subdir/"; + append_to_file "$test_primary_datadir/tst_both_dir/both_subdir/both_file3", "in both3"; RewindTest::create_standby($test_mode); - # Create different subdirs and files in master and standby + # Create different subdirs and files in primary and standby my $test_standby_datadir = $node_standby->data_dir; mkdir "$test_standby_datadir/tst_standby_dir"; @@ -45,15 +45,15 @@ sub run_test "$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file3", "in standby3"; - mkdir "$test_master_datadir/tst_master_dir"; - append_to_file "$test_master_datadir/tst_master_dir/master_file1", - "in master1"; - append_to_file "$test_master_datadir/tst_master_dir/master_file2", - "in master2"; - mkdir "$test_master_datadir/tst_master_dir/master_subdir/"; + mkdir "$test_primary_datadir/tst_primary_dir"; + append_to_file "$test_primary_datadir/tst_primary_dir/primary_file1", + "in primary1"; + append_to_file "$test_primary_datadir/tst_primary_dir/primary_file2", + "in primary2"; + mkdir "$test_primary_datadir/tst_primary_dir/primary_subdir/"; append_to_file - "$test_master_datadir/tst_master_dir/master_subdir/master_file3", - "in master3"; + "$test_primary_datadir/tst_primary_dir/primary_subdir/primary_file3", + "in primary3"; RewindTest::promote_standby(); RewindTest::run_pg_rewind($test_mode); @@ -65,21 +65,21 @@ sub run_test push @paths, $File::Find::name if $File::Find::name =~ m/.*tst_.*/; }, - $test_master_datadir); + $test_primary_datadir); @paths = sort @paths; is_deeply( \@paths, [ - "$test_master_datadir/tst_both_dir", - "$test_master_datadir/tst_both_dir/both_file1", - "$test_master_datadir/tst_both_dir/both_file2", - "$test_master_datadir/tst_both_dir/both_subdir", - "$test_master_datadir/tst_both_dir/both_subdir/both_file3", - "$test_master_datadir/tst_standby_dir", - "$test_master_datadir/tst_standby_dir/standby_file1", - "$test_master_datadir/tst_standby_dir/standby_file2", - "$test_master_datadir/tst_standby_dir/standby_subdir", - "$test_master_datadir/tst_standby_dir/standby_subdir/standby_file3" + "$test_primary_datadir/tst_both_dir", + "$test_primary_datadir/tst_both_dir/both_file1", + "$test_primary_datadir/tst_both_dir/both_file2", + "$test_primary_datadir/tst_both_dir/both_subdir", + "$test_primary_datadir/tst_both_dir/both_subdir/both_file3", + "$test_primary_datadir/tst_standby_dir", + "$test_primary_datadir/tst_standby_dir/standby_file1", + "$test_primary_datadir/tst_standby_dir/standby_file2", + "$test_primary_datadir/tst_standby_dir/standby_subdir", + "$test_primary_datadir/tst_standby_dir/standby_subdir/standby_file3" ], "file lists match"); |