From 2110b84f7ef014bdde298c79dd63c3fd9bced687 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 18 Jul 2019 19:22:49 -0400
Subject: [PATCH] Fix issue #59 - Test replicaof config variable

Former-commit-id: d5ecc2347a717f6e6f938d81325476a9c3dff9a6
---
 tests/integration/replication-active.tcl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/integration/replication-active.tcl b/tests/integration/replication-active.tcl
index 4583da321..dd4923944 100644
--- a/tests/integration/replication-active.tcl
+++ b/tests/integration/replication-active.tcl
@@ -4,7 +4,10 @@ start_server {tags {"active-repl"} overrides {active-replica yes}} {
     set slave_port [srv 0 port]
     set slave_log [srv 0 stdout]
     set slave_pid [s process_id]
-    start_server {overrides {active-replica yes}} {
+
+    set replicaArgs "$slave_host $slave_port"
+    set overridesT "active-replica yes"
+    start_server [list overrides [list active-replica yes replicaof [list $slave_host $slave_port]]] {
         set master [srv 0 client]
         set master_host [srv 0 host]
         set master_port [srv 0 port]
@@ -13,10 +16,11 @@ start_server {tags {"active-repl"} overrides {active-replica yes}} {
         # are no bugs the timeout is triggered in a reasonable amount
         # of time.
         $slave config set repl-timeout 5
+        $master config set repl-timeout 5
 
         # Start the replication process...
         $slave slaveof $master_host $master_port
-        $master slaveof $slave_host $slave_port
+        #note the master is a replica via the config (see start_server above)
 
         test {Active replicas report the correct role} {
             wait_for_condition 50 100 {