summaryrefslogtreecommitdiff
path: root/spec/ruby/library/syslog/shared
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/library/syslog/shared')
-rw-r--r--spec/ruby/library/syslog/shared/log.rb13
-rw-r--r--spec/ruby/library/syslog/shared/reopen.rb40
2 files changed, 6 insertions, 47 deletions
diff --git a/spec/ruby/library/syslog/shared/log.rb b/spec/ruby/library/syslog/shared/log.rb
index b8b812a13c..98ce4f54b2 100644
--- a/spec/ruby/library/syslog/shared/log.rb
+++ b/spec/ruby/library/syslog/shared/log.rb
@@ -1,15 +1,15 @@
describe :syslog_log, shared: true 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 "logs a message" do
- lambda {
+ -> {
Syslog.open("rubyspec", Syslog::LOG_PERROR) do
Syslog.send(@method, "Hello")
end
@@ -17,7 +17,7 @@ describe :syslog_log, shared: true do
end
it "accepts sprintf arguments" do
- lambda {
+ -> {
Syslog.open("rubyspec", Syslog::LOG_PERROR) do
Syslog.send(@method, "Hello %s", "world")
Syslog.send(@method, "%d dogs", 2)
@@ -27,8 +27,7 @@ describe :syslog_log, shared: true do
it "works as an alias for Syslog.log" do
level = Syslog.const_get "LOG_#{@method.to_s.upcase}"
- response = "rubyspec: Hello\n"
- lambda {
+ -> {
Syslog.open("rubyspec", Syslog::LOG_PERROR) do
Syslog.send(@method, "Hello")
Syslog.log(level, "Hello")
diff --git a/spec/ruby/library/syslog/shared/reopen.rb b/spec/ruby/library/syslog/shared/reopen.rb
deleted file mode 100644
index fd30ab824a..0000000000
--- a/spec/ruby/library/syslog/shared/reopen.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-describe :syslog_reopen, shared: true do
- platform_is_not :windows do
- before :each do
- Syslog.opened?.should be_false
- end
-
- after :each do
- Syslog.opened?.should be_false
- end
-
- it "reopens the log" do
- Syslog.open
- lambda { Syslog.send(@method)}.should_not raise_error
- Syslog.opened?.should be_true
- Syslog.close
- end
-
- it "fails with RuntimeError if the log is closed" do
- lambda { Syslog.send(@method)}.should raise_error(RuntimeError)
- end
-
- it "receives the same parameters as Syslog.open" do
- Syslog.open
- Syslog.send(@method, "rubyspec", 3, 8) do |s|
- s.should == Syslog
- s.ident.should == "rubyspec"
- s.options.should == 3
- s.facility.should == Syslog::LOG_USER
- s.opened?.should be_true
- end
- Syslog.opened?.should be_false
- end
-
- it "returns the module" do
- Syslog.open
- Syslog.send(@method).should == Syslog
- Syslog.close
- end
- end
-end