From 85b06f48cf8eeb92a95e31bf4897cb491497c4f5 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Thu, 24 Mar 2016 21:57:54 -0400
Subject: [PATCH] Revert "Add debug logging for Vagrant upgrade test"

This reverts commit 7ecfa6e2adc472cd897aeb2c245f3a095fc65d78.
---
 .../src/test/resources/packaging/scripts/80_upgrade.bats    | 2 --
 .../resources/packaging/scripts/packaging_test_utils.bash   | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/qa/vagrant/src/test/resources/packaging/scripts/80_upgrade.bats b/qa/vagrant/src/test/resources/packaging/scripts/80_upgrade.bats
index deeb37d54e5..48bf2aca4e3 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/80_upgrade.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/80_upgrade.bats
@@ -42,7 +42,6 @@ setup() {
 @test "[UPGRADE] install old version" {
     clean_before_test
     install_package -v $(cat upgrade_from_version)
-    perl -p -i -e 's/es.logger.level: INFO/es.logger.level: DEBUG/' /etc/elasticsearch/logging.yml
 }
 
 @test "[UPGRADE] start old version" {
@@ -81,7 +80,6 @@ setup() {
 
 @test "[UPGRADE] install version under test" {
     install_package -u
-    perl -p -i -e 's/es.logger.level: INFO/es.logger.level: DEBUG/' /etc/elasticsearch/logging.yml
 }
 
 @test "[UPGRADE] start version under test" {
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash b/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash
index 5aaac123ab7..133b6e16f1a 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash
+++ b/qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash
@@ -400,10 +400,6 @@ wait_for_elasticsearch_status() {
     local desiredStatus=${1:-green}
     local index=$2
 
-    if [ -f /var/log/elasitcsearch/elasticsearch.log ]; then
-      cat /var/log/elasticsearch/elasticsearch.log >&3
-    fi
-
     echo "Making sure elasticsearch is up..."
     wget -O - --retry-connrefused --waitretry=1 --timeout=60 --tries 60 http://localhost:9200/_cluster/health || {
           echo "Looks like elasticsearch never started. Here is its log:"
@@ -413,7 +409,6 @@ wait_for_elasticsearch_status() {
               echo "The elasticsearch log doesn't exist. Maybe /var/log/messages has something:"
               tail -n20 /var/log/messages
           fi
-          cat /var/log/elasticsearch/elasticsearch.log >&3
           false
     }
 
@@ -428,7 +423,6 @@ wait_for_elasticsearch_status() {
         echo "Connected"
     else
         echo "Unable to connect to Elastisearch"
-        cat /var/log/elasticsearch/elasticsearch.log >&3
         false
     fi