From 2fef83aa60dba5bf0110d11c4f9991e8a2fc2c7c Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 4 Apr 2019 00:25:30 -0400
Subject: [PATCH] Fix some more failing tests

Former-commit-id: cd836a37e74e4fdf3bbe49f1697c68e6db4eb20a
---
 src/core.REMOVED.git-id                    |  1 -
 src/server.cpp                             | 18 +++++++++---------
 tests/cluster/tests/05-slave-selection.tcl |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 src/core.REMOVED.git-id

diff --git a/src/core.REMOVED.git-id b/src/core.REMOVED.git-id
deleted file mode 100644
index 251962f07..000000000
--- a/src/core.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-f6027990a0231d80395d15f8f867d3a31eea285d
\ No newline at end of file
diff --git a/src/server.cpp b/src/server.cpp
index 53586d7f0..333e40c79 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4313,12 +4313,12 @@ extern "C" sds genRedisInfoString(const char *section) {
                     slave_repl_offset = mi->cached_master->reploff;
 
                 info = sdscatprintf(info,
-                    "\tmaster_host:%s\r\n"
-                    "\tmaster_port:%d\r\n"
-                    "\tmaster_link_status:%s\r\n"
-                    "\tmaster_last_io_seconds_ago:%d\r\n"
-                    "\tmaster_sync_in_progress:%d\r\n"
-                    "\tslave_repl_offset:%lld\r\n"
+                    "master_host:%s\r\n"
+                    "master_port:%d\r\n"
+                    "master_link_status:%s\r\n"
+                    "master_last_io_seconds_ago:%d\r\n"
+                    "master_sync_in_progress:%d\r\n"
+                    "slave_repl_offset:%lld\r\n"
                     ,mi->masterhost,
                     mi->masterport,
                     (mi->repl_state == REPL_STATE_CONNECTED) ?
@@ -4331,8 +4331,8 @@ extern "C" sds genRedisInfoString(const char *section) {
 
                 if (mi->repl_state == REPL_STATE_TRANSFER) {
                     info = sdscatprintf(info,
-                        "\tmaster_sync_left_bytes:%lld\r\n"
-                        "\tmaster_sync_last_io_seconds_ago:%d\r\n"
+                        "master_sync_left_bytes:%lld\r\n"
+                        "master_sync_last_io_seconds_ago:%d\r\n"
                         , (long long)
                             (mi->repl_transfer_size - mi->repl_transfer_read),
                         (int)(server.unixtime-mi->repl_transfer_lastio)
@@ -4341,7 +4341,7 @@ extern "C" sds genRedisInfoString(const char *section) {
 
                 if (mi->repl_state != REPL_STATE_CONNECTED) {
                     info = sdscatprintf(info,
-                        "\tmaster_link_down_since_seconds:%jd\r\n",
+                        "master_link_down_since_seconds:%jd\r\n",
                         (intmax_t)server.unixtime-mi->repl_down_since);
                 }
             }
diff --git a/tests/cluster/tests/05-slave-selection.tcl b/tests/cluster/tests/05-slave-selection.tcl
index bcb0fa1ea..6769d3070 100644
--- a/tests/cluster/tests/05-slave-selection.tcl
+++ b/tests/cluster/tests/05-slave-selection.tcl
@@ -163,7 +163,7 @@ test "New Master down consecutively" {
         wait_for_condition 1000 50 {
             [master_detected $instances]
         } else {
-            failover "No failover detected when master $master_id fails"
+            fail "No failover detected when master $master_id fails"
         }
 
         assert_cluster_state ok