Revert "Increase timeout when waiting for log messages"

This commit caused the tests of our produciton integration with
AppDirect to fail. I'm reverting it until I find a fix.

This reverts commit c25c9b5.

Gemfile

@@ -6,7 +6,7 @@ gem 'ci_reporter'
 gem 'cfoundry', '~> 4.0.4.rc2'
 gem 'cf-uaa-lib'
 gem 'httparty'
-gem 'blue-shell', '~> 0.3.0'
+gem 'blue-shell'
 gem 'parallel_tests'
 
 group :monitoring do

Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     activesupport (3.2.14)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    blue-shell (0.3.0)
+    blue-shell (0.2.2)
       rspec
     builder (3.0.4)
     cf-uaa-lib (1.3.10)
@@ -49,7 +49,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  blue-shell (~> 0.3.0)
+  blue-shell
   cf-uaa-lib
   cfoundry (~> 4.0.4.rc2)
   ci_reporter

spec/loggregator_spec.rb

@@ -52,15 +52,13 @@ def check_loggregator_works
     puts "starting #{__method__} (#{Time.now})"
 
     BlueShell::Runner.run("gcf logs #{app_name}") do |runner|
-      runner.with_timeout 60 do
-        runner.should say "Connected, tailing logs for app #{app_name}"
-
-        # Hit twice to see that both router and app messages come through; order is not guaranteed
-        page_content
-        runner.should say "[RTR]"
-        page_content
-        runner.should say "[App/0]"
-      end
+      runner.should say "Connected, tailing logs for app #{app_name}"
+
+      # Hit twice to see that both router and app messages come through; order is not guaranteed
+      page_content
+      runner.should say "[RTR]"
+      page_content
+      runner.should say "[App/0]"
     end
   end