From fab2f28637a4392ef7e0bfbdf9bcac51f5fb5fd7 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Tue, 1 Mar 2016 16:50:24 +0900
Subject: [PATCH 2/2] Prefix test numbers to node directories

Add prefix numbers to node names to make the replication tests leave
directories with reasonable names on failure.
---
 src/test/recovery/t/001_stream_rep.pl       | 6 +++---
 src/test/recovery/t/002_archiving.pl        | 4 ++--
 src/test/recovery/t/003_recovery_targets.pl | 4 ++--
 src/test/recovery/t/004_timeline_switch.pl  | 6 +++---
 src/test/recovery/t/005_replay_delay.pl     | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl
index 7dcca65..6f2d13b 100644
--- a/src/test/recovery/t/001_stream_rep.pl
+++ b/src/test/recovery/t/001_stream_rep.pl
@@ -6,7 +6,7 @@ use TestLib;
 use Test::More tests => 4;
 
 # Initialize master node
-my $node_master = get_new_node('master');
+my $node_master = get_new_node('001_master');
 $node_master->init(allows_streaming => 1);
 $node_master->start;
 my $backup_name = 'my_backup';
@@ -15,7 +15,7 @@ my $backup_name = 'my_backup';
 $node_master->backup($backup_name);
 
 # Create streaming standby linking to master
-my $node_standby_1 = get_new_node('standby_1');
+my $node_standby_1 = get_new_node('001_standby_1');
 $node_standby_1->init_from_backup($node_master, $backup_name,
 	has_streaming => 1);
 $node_standby_1->start;
@@ -25,7 +25,7 @@ $node_standby_1->start;
 $node_standby_1->backup($backup_name);
 
 # Create second standby node linking to standby 1
-my $node_standby_2 = get_new_node('standby_2');
+my $node_standby_2 = get_new_node('001_standby_2');
 $node_standby_2->init_from_backup($node_standby_1, $backup_name,
 	has_streaming => 1);
 $node_standby_2->start;
diff --git a/src/test/recovery/t/002_archiving.pl b/src/test/recovery/t/002_archiving.pl
index 67bb7df..5dafcf2 100644
--- a/src/test/recovery/t/002_archiving.pl
+++ b/src/test/recovery/t/002_archiving.pl
@@ -7,7 +7,7 @@ use Test::More tests => 1;
 use File::Copy;
 
 # Initialize master node, doing archives
-my $node_master = get_new_node('master');
+my $node_master = get_new_node('002_master');
 $node_master->init(
 	has_archiving    => 1,
 	allows_streaming => 1);
@@ -20,7 +20,7 @@ $node_master->start;
 $node_master->backup($backup_name);
 
 # Initialize standby node from backup, fetching WAL from archives
-my $node_standby = get_new_node('standby');
+my $node_standby = get_new_node('002_standby');
 $node_standby->init_from_backup($node_master, $backup_name,
 	has_restoring => 1);
 $node_standby->append_conf(
diff --git a/src/test/recovery/t/003_recovery_targets.pl b/src/test/recovery/t/003_recovery_targets.pl
index 8b581cc..8552e5b 100644
--- a/src/test/recovery/t/003_recovery_targets.pl
+++ b/src/test/recovery/t/003_recovery_targets.pl
@@ -16,7 +16,7 @@ sub test_recovery_standby
 	my $num_rows        = shift;
 	my $until_lsn       = shift;
 
-	my $node_standby = get_new_node($node_name);
+	my $node_standby = get_new_node("003_".$node_name);
 	$node_standby->init_from_backup($node_master, 'my_backup',
 		has_restoring => 1);
 
@@ -46,7 +46,7 @@ sub test_recovery_standby
 }
 
 # Initialize master node
-my $node_master = get_new_node('master');
+my $node_master = get_new_node('003_master');
 $node_master->init(has_archiving => 1, allows_streaming => 1);
 
 # Start it
diff --git a/src/test/recovery/t/004_timeline_switch.pl b/src/test/recovery/t/004_timeline_switch.pl
index 58bf580..fc5399d 100644
--- a/src/test/recovery/t/004_timeline_switch.pl
+++ b/src/test/recovery/t/004_timeline_switch.pl
@@ -11,7 +11,7 @@ use Test::More tests => 1;
 $ENV{PGDATABASE} = 'postgres';
 
 # Initialize master node
-my $node_master = get_new_node('master');
+my $node_master = get_new_node('004_master');
 $node_master->init(allows_streaming => 1);
 $node_master->start;
 
@@ -20,11 +20,11 @@ my $backup_name = 'my_backup';
 $node_master->backup($backup_name);
 
 # Create two standbys linking to it
-my $node_standby_1 = get_new_node('standby_1');
+my $node_standby_1 = get_new_node('004_standby_1');
 $node_standby_1->init_from_backup($node_master, $backup_name,
 	has_streaming => 1);
 $node_standby_1->start;
-my $node_standby_2 = get_new_node('standby_2');
+my $node_standby_2 = get_new_node('004_standby_2');
 $node_standby_2->init_from_backup($node_master, $backup_name,
 	has_streaming => 1);
 $node_standby_2->start;
diff --git a/src/test/recovery/t/005_replay_delay.pl b/src/test/recovery/t/005_replay_delay.pl
index 401d17b..b04fbdb 100644
--- a/src/test/recovery/t/005_replay_delay.pl
+++ b/src/test/recovery/t/005_replay_delay.pl
@@ -6,7 +6,7 @@ use TestLib;
 use Test::More tests => 2;
 
 # Initialize master node
-my $node_master = get_new_node('master');
+my $node_master = get_new_node('005_master');
 $node_master->init(allows_streaming => 1);
 $node_master->start;
 
@@ -19,7 +19,7 @@ my $backup_name = 'my_backup';
 $node_master->backup($backup_name);
 
 # Create streaming standby from backup
-my $node_standby = get_new_node('standby');
+my $node_standby = get_new_node('005_standby');
 $node_standby->init_from_backup($node_master, $backup_name,
 	has_streaming => 1);
 $node_standby->append_conf(
-- 
1.8.3.1

