More interface tweaks.

--HG--
rename : mauveserver.conf => etc/mauveserver.conf
rename : test/ts_mauve.rb => test/test_mauve.rb

2 files changed, 12 insertions, 9 deletions

diff --git a/test/tc_mauve_configuration_builders_server.rb b/test/tc_mauve_configuration_builders_server.rb
index 4330610..270c046 100644
--- a/test/tc_mauve_configuration_builders_server.rb
+++ b/test/tc_mauve_configuration_builders_server.rb
@@ -53,8 +53,8 @@ EOF
     assert_equal(detail, h.detail)
     assert_equal(summary, h.summary)
     assert_equal(destination, h.destination)
-    assert_equal(raise_after, h.raise_at)
-    assert_equal(send_every, h.sleep_interval) 
+    assert_equal(raise_after, h.raise_after)
+    assert_equal(send_every, h.poll_every) 
   end
 
   def test_web_interface_params
@@ -94,14 +94,14 @@ server {
   listener {
     ip "#{ip}"
     port #{port}
-    sleep_interval #{sleep_interval}
+    poll_every #{sleep_interval}
   }
 }
 EOF
 
     assert_nothing_raised { Mauve::ConfigurationBuilder.parse(config) }
     u = Mauve::UDPServer.instance
-    assert_equal(sleep_interval, u.sleep_interval)
+    assert_equal(sleep_interval, u.poll_every)
     assert_equal(IPAddr.new(ip), u.ip)
     assert_equal(port, u.port)
   end
@@ -111,14 +111,14 @@ EOF
     config=<<EOF
 server {
   notifier {
-    sleep_interval #{sleep_interval}
+    poll_every #{sleep_interval}
   }
 }
 EOF
 
     assert_nothing_raised { Mauve::ConfigurationBuilder.parse(config) }
     n = Mauve::Notifier.instance
-    assert_equal(sleep_interval, n.sleep_interval)
+    assert_equal(sleep_interval, n.poll_every)
   end
 
   def test_processor_params
@@ -129,7 +129,7 @@ EOF
 server {
   processor {
     transmission_cache_expire_time #{transmission_cache_expire_time}
-    sleep_interval #{sleep_interval}
+    poll_every #{sleep_interval}
   }
 }
 EOF
@@ -137,7 +137,7 @@ EOF
     assert_nothing_raised { Mauve::ConfigurationBuilder.parse(config) }
     pr = Mauve::Processor.instance    
     assert_equal(transmission_cache_expire_time, pr.transmission_cache_expire_time)
-    assert_equal(sleep_interval, pr.sleep_interval)
+    assert_equal(sleep_interval, pr.poll_every)
   end
 
 end
diff --git a/test/ts_mauve.rb b/test/test_mauve.rb
index 27284a6..e3df469 100644
--- a/test/ts_mauve.rb
+++ b/test/test_mauve.rb
@@ -1,5 +1,8 @@
 
-$:.unshift "../lib"
+%w(. ..).each do |path|
+  libdir = File.join(path,"lib")
+  $:.unshift libdir if File.directory?(libdir)
+end
 
 require 'test/unit'