From 3fffb9bebc9ab6c93ee565826ed2da758e2c8f1c Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 5 Oct 2016 14:58:29 -0400
Subject: [PATCH] Revert unnecessary commits attempting to fix Travis/Circle CI
 tests.

After much debugging, I have tracked down and fixed the root cause of the
test failures: colorized app output was silenced because the Log.format
function could not require("cli-color").

Revert "Wait for "=> App running at:" in packages/test-in-console/run.sh."
This reverts commit 0713b9d153b11679e5185f3a45e66030954ed893.

Revert "Use console.log to print test-in-console listening message."
This reverts commit a421da5a5e64c09fa37b2eb439c8e6d37192e7b7.
---
 packages/test-in-console/package.js  |  2 +-
 packages/test-in-console/reporter.js | 14 +++++++-------
 packages/test-in-console/run.sh      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js
index e521bfd1cb..3f6a67482e 100644
--- a/packages/test-in-console/package.js
+++ b/packages/test-in-console/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Run tests noninteractively, with results going to the console.",
-  version: '1.0.13'
+  version: '1.0.12'
 });
 
 Package.onUse(function (api) {
diff --git a/packages/test-in-console/reporter.js b/packages/test-in-console/reporter.js
index 54c95f3a02..5f12d912f9 100644
--- a/packages/test-in-console/reporter.js
+++ b/packages/test-in-console/reporter.js
@@ -1,10 +1,3 @@
-// provide some notification we're started. This is to allow use
-// in automated scripts with `meteor run --once` which does not
-// print when the proxy is listening.
-Meteor.startup(function () {
-  console.log("test-in-console listening");
-});
-
 // A hacky way to extract the phantom runner script from the package.
 if (process.env.WRITE_RUNNER_JS) {
   Npm.require('fs').writeFileSync(
@@ -33,3 +26,10 @@ Meteor.methods({
     return null;
   }
 });
+
+// provide some notification we're started. This is to allow use
+// in automated scripts with `meteor run --once` which does not
+// print when the proxy is listening.
+Meteor.startup(function () {
+  Meteor._debug("test-in-console listening");
+});
diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh
index ca965cb18f..8bff4bb0a1 100755
--- a/packages/test-in-console/run.sh
+++ b/packages/test-in-console/run.sh
@@ -19,7 +19,7 @@ export URL='http://localhost:4096/'
 exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''})
 EXEC_PID=$!
 
-sed '/^=> App running at:/q' <&3
+sed '/test-in-console listening$/q' <&3
 ./dev_bundle/bin/phantomjs "$METEOR_HOME/packages/test-in-console/runner.js"
 STATUS=$?