- Try to make the tests a bit more rvm friendly.

test/logstash/inputs/test_stomp.rb

@@ -24,8 +24,13 @@ def em_setup
       @port = (rand * 30000 + 20000).to_i
       @stomp_pid = Process.fork do
         args = ["-p", @port.to_s, *@flags]
-        exec("stompserver", "stompserver", *args)
-        $stderr.puts("$!")
+        stompbin = Gem.bin_path('stompserver', 'stompserver')
+        exec("/proc/$$/exe", "ruby", "-rubygems", stompbin, *args)
+        #$0 = "stompserver"
+        #ARGV.clear
+        #ARGV.unshift *args
+        #gem 'stompserver'
+        $stderr.puts($!)
         exit 1
       end
 

test/logstash/outputs/test_elasticsearch.rb

@@ -77,9 +77,10 @@ def test_elasticsearch_basic
       em_setup
 
       events = []
+      myfile = File.basename(__FILE__)
       1.upto(5).each do |i|
         events << LogStash::Event.new("@message" => "just another log rollin' #{i}",
-                                      "@source" => "logstash tests in #{__FILE__}")
+                                      "@source" => "logstash tests in #{myfile}")
       end
 
       # TODO(sissel): Need a way to hook when the agent is ready?

test/standalone.sh

@@ -14,8 +14,6 @@ fi
 
 . "$rvm"
 rvm rvmrc trust logstash
-cd logstash
-
 git pull origin master
 git checkout master
 
@@ -31,6 +29,11 @@ rvm gemset create $gemset
 rvm "$ruby@$gemset" gem uninstall -ax logstash || true
 rvm "$ruby@$gemset" gem build logstash.gemspec
 rvm "$ruby@$gemset" gem install --no-ri --no-rdoc logstash-*.gem
+
+# stompserver says it wants 'hoe >= 1.1.1' and the latest 'hoe' requires
+# some bullshit version of rubygems that nobody will have, so install
+# an older one.
+rvm "$ruby@$gemset" gem install --no-ri --no-rdoc hoe -v "1.1.1"
 rvm "$ruby@$gemset" gem install --no-ri --no-rdoc stompserver
 rvm "$ruby@$gemset" exec logstash-test