Load libraries and sqlite3 database relative to self

diff --git a/modules/remotebackend/regression-tests/dnsbackend.rb b/modules/remotebackend/regression-tests/dnsbackend.rb
index aaac5a5b7f98859b07f0846c69a0f9f94803eb15..8fce5e56f23b479d6bba3ad3d0a5508ec4b4c856 100644 (file)
--- a/modules/remotebackend/regression-tests/dnsbackend.rb
+++ b/modules/remotebackend/regression-tests/dnsbackend.rb
@@ -6,6 +6,7 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
      @dnsbackend = dnsbackend
      @semaphore = Mutex.new
      @f = File.open("/tmp/tmp.txt","a")
+     @f.sync
    end
 
    def parse_arrays(params)
@@ -81,9 +82,9 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
     
      # get more arguments
      req.each do |k,v|
-        attr = k[/X-RemoteBackend-(.*)/,1]
+        attr = k[/x-remotebackend-(.*)/i,1]
         if attr 
-          args[attr] = v
+          args[attr.downcase] = v
         end
      end
 

diff --git a/modules/remotebackend/regression-tests/http-backend.rb b/modules/remotebackend/regression-tests/http-backend.rb
index 30cda13cc8a2b9cc28721ee3f786572f2d1efef4..21b5e808e2e2ad49efe5a980fde76e25c3f61856 100755 (executable)
--- a/modules/remotebackend/regression-tests/http-backend.rb
+++ b/modules/remotebackend/regression-tests/http-backend.rb
@@ -2,8 +2,9 @@
 require "rubygems"
 require 'bundler/setup'
 require "webrick"
-require "../modules/remotebackend/regression-tests/dnsbackend"
-require "../modules/remotebackend/regression-tests/backend"
+$:.unshift File.dirname(__FILE__)
+require "dnsbackend"
+require "backend"
 
 server = WEBrick::HTTPServer.new(
        :Port=>62434,
@@ -12,7 +13,7 @@ server = WEBrick::HTTPServer.new(
        :AccessLog=>[ [ File.open("remotebackend-access.log", "w"), WEBrick::AccessLog::COMBINED_LOG_FORMAT ] ] 
 )
 
-be = Handler.new("../modules/remotebackend/regression-tests/remote.sqlite3") 
+be = Handler.new("#{File.dirname(__FILE__)}/remote.sqlite3")
 server.mount "/dns", DNSBackendHandler, be
 server.mount_proc("/ping"){ |req,resp| resp.body = "pong" }
 

diff --git a/modules/remotebackend/regression-tests/pipe-backend.rb b/modules/remotebackend/regression-tests/pipe-backend.rb
index f9a8467329418c3e499a8492a526c978990e48d8..ebf7e8c4bf19614c85d819eabfdcc5fba3571d41 100755 (executable)
--- a/modules/remotebackend/regression-tests/pipe-backend.rb
+++ b/modules/remotebackend/regression-tests/pipe-backend.rb
@@ -2,11 +2,13 @@
 require "rubygems"
 require 'bundler/setup'
 require 'json'
-require '../modules/remotebackend/regression-tests/backend'
+$:.unshift File.dirname(__FILE__)
+require "backend"
 
-h = Handler.new("../modules/remotebackend/regression-tests/remote.sqlite3")
+h = Handler.new("#{File.dirname(__FILE__)}/remote.sqlite3")
 
 f = File.open "/tmp/tmp.txt","a"
+f.sync = true
 
 STDOUT.sync = true
 begin 
@@ -18,6 +20,7 @@ begin
     next if line.empty?
     begin
       input = JSON.parse(line)
+      next unless input and input["method"]
       method = "do_#{input["method"].downcase}"
       args = input["parameters"]
 

diff --git a/modules/remotebackend/regression-tests/zeromq-backend.rb b/modules/remotebackend/regression-tests/zeromq-backend.rb
index 456954ef598df77cc401da686b7cf1ca77fda8e1..073781ebf25cdfa6a23ce74bd5553852743e426a 100755 (executable)
--- a/modules/remotebackend/regression-tests/zeromq-backend.rb
+++ b/modules/remotebackend/regression-tests/zeromq-backend.rb
@@ -5,11 +5,11 @@ require "rubygems"
 require 'bundler/setup'
 require 'json'
 require 'zero_mq'
-require '../modules/remotebackend/regression-tests/backend'
-
-h = Handler.new("../modules/remotebackend/regression-tests/remote.sqlite3")
+$:.unshift File.dirname(__FILE__)
+require "backend"
 
 f = File.open "/tmp/tmp.txt","a"
+f.sync = true
 
 begin
   context = ZeroMQ::Context.new
@@ -26,6 +26,7 @@ begin
     next if line.empty?
     begin
       input = JSON.parse(line)
+      next unless input and input["method"]
       method = "do_#{input["method"].downcase}"
       args = input["parameters"] || []