1 files changed, 15 insertions, 14 deletions

diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb
index 2403943cfc..1650283371 100644
--- a/spec/ruby/library/syslog/log_spec.rb
+++ b/spec/ruby/library/syslog/log_spec.rb
@@ -1,54 +1,55 @@
+require_relative '../../spec_helper'
+
 platform_is_not :windows do
-  require File.expand_path('../../../spec_helper', __FILE__)
   require 'syslog'
 
   describe "Syslog.log" do
-    platform_is_not :windows, :darwin, :solaris, :aix do
+    platform_is_not :windows, :darwin, :aix, :android do
 
       before :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       after :each do
-        Syslog.opened?.should be_false
+        Syslog.opened?.should == false
       end
 
       it "receives a priority as first argument" do
-        lambda {
+        -> {
           Syslog.open("rubyspec", Syslog::LOG_PERROR) do |s|
             s.log(Syslog::LOG_ALERT, "Hello")
             s.log(Syslog::LOG_CRIT, "World")
           end
-        }.should output_to_fd("rubyspec: Hello\nrubyspec: World\n", $stderr)
+        }.should output_to_fd(/\Arubyspec(?::| \d+ - -) Hello\nrubyspec(?::| \d+ - -) World\n\z/, $stderr)
       end
 
-      it "accepts undefined priorites" do
-        lambda {
+      it "accepts undefined priorities" do
+        -> {
           Syslog.open("rubyspec", Syslog::LOG_PERROR) do |s|
             s.log(1337, "Hello")
           end
           # use a regex since it'll output unknown facility/priority messages
-        }.should output_to_fd(/rubyspec: Hello/, $stderr)
+        }.should output_to_fd(/rubyspec(?::| \d+ - -) Hello\n\z/, $stderr)
       end
 
       it "fails with TypeError on nil log messages" do
         Syslog.open do |s|
-          lambda { s.log(1, nil) }.should raise_error(TypeError)
+          -> { s.log(1, nil) }.should.raise(TypeError)
         end
       end
 
       it "fails if the log is closed" do
-        lambda {
+        -> {
           Syslog.log(Syslog::LOG_ALERT, "test")
-        }.should raise_error(RuntimeError)
+        }.should.raise(RuntimeError)
       end
 
       it "accepts printf parameters" do
-        lambda {
+        -> {
           Syslog.open("rubyspec", Syslog::LOG_PERROR) do |s|
             s.log(Syslog::LOG_ALERT, "%s x %d", "chunky bacon", 2)
           end
-        }.should output_to_fd("rubyspec: chunky bacon x 2\n", $stderr)
+        }.should output_to_fd(/rubyspec(?::| \d+ - -) chunky bacon x 2\n\z/, $stderr)
       end
     end
   end