diff options
Diffstat (limited to 'spec/ruby/library/syslog')
20 files changed, 47 insertions, 22 deletions
diff --git a/spec/ruby/library/syslog/alert_spec.rb b/spec/ruby/library/syslog/alert_spec.rb index 4653fa8636..e61b3d6ef3 100644 --- a/spec/ruby/library/syslog/alert_spec.rb +++ b/spec/ruby/library/syslog/alert_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/close_spec.rb b/spec/ruby/library/syslog/close_spec.rb index f7bc4ac6e9..d7aadb2198 100644 --- a/spec/ruby/library/syslog/close_spec.rb +++ b/spec/ruby/library/syslog/close_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.close" do diff --git a/spec/ruby/library/syslog/constants_spec.rb b/spec/ruby/library/syslog/constants_spec.rb index c335ff46e6..1ce82be883 100644 --- a/spec/ruby/library/syslog/constants_spec.rb +++ b/spec/ruby/library/syslog/constants_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog::Constants" do diff --git a/spec/ruby/library/syslog/crit_spec.rb b/spec/ruby/library/syslog/crit_spec.rb index 28e3af67cc..cf2cc71abc 100644 --- a/spec/ruby/library/syslog/crit_spec.rb +++ b/spec/ruby/library/syslog/crit_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/debug_spec.rb b/spec/ruby/library/syslog/debug_spec.rb index ff9fc5d97e..09ba9997a2 100644 --- a/spec/ruby/library/syslog/debug_spec.rb +++ b/spec/ruby/library/syslog/debug_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/emerg_spec.rb b/spec/ruby/library/syslog/emerg_spec.rb index 15cc49be32..d416ee57c6 100644 --- a/spec/ruby/library/syslog/emerg_spec.rb +++ b/spec/ruby/library/syslog/emerg_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/err_spec.rb b/spec/ruby/library/syslog/err_spec.rb index fdadd49e09..ad65f6c276 100644 --- a/spec/ruby/library/syslog/err_spec.rb +++ b/spec/ruby/library/syslog/err_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/facility_spec.rb b/spec/ruby/library/syslog/facility_spec.rb index 02ea754b6b..fdcabfa0dd 100644 --- a/spec/ruby/library/syslog/facility_spec.rb +++ b/spec/ruby/library/syslog/facility_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.facility" do diff --git a/spec/ruby/library/syslog/ident_spec.rb b/spec/ruby/library/syslog/ident_spec.rb index a685dfa927..ef1144f12e 100644 --- a/spec/ruby/library/syslog/ident_spec.rb +++ b/spec/ruby/library/syslog/ident_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.ident" do diff --git a/spec/ruby/library/syslog/info_spec.rb b/spec/ruby/library/syslog/info_spec.rb index 88ff81994d..b2abe7c04a 100644 --- a/spec/ruby/library/syslog/info_spec.rb +++ b/spec/ruby/library/syslog/info_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/inspect_spec.rb b/spec/ruby/library/syslog/inspect_spec.rb index 5fd7793c22..c22a053286 100644 --- a/spec/ruby/library/syslog/inspect_spec.rb +++ b/spec/ruby/library/syslog/inspect_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.inspect" do diff --git a/spec/ruby/library/syslog/instance_spec.rb b/spec/ruby/library/syslog/instance_spec.rb index 60f43dbdea..65d97a5d50 100644 --- a/spec/ruby/library/syslog/instance_spec.rb +++ b/spec/ruby/library/syslog/instance_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.instance" do diff --git a/spec/ruby/library/syslog/log_spec.rb b/spec/ruby/library/syslog/log_spec.rb index 2403943cfc..eac6be8b01 100644 --- a/spec/ruby/library/syslog/log_spec.rb +++ b/spec/ruby/library/syslog/log_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.log" do diff --git a/spec/ruby/library/syslog/mask_spec.rb b/spec/ruby/library/syslog/mask_spec.rb index 49be56d304..7a11d1e88c 100644 --- a/spec/ruby/library/syslog/mask_spec.rb +++ b/spec/ruby/library/syslog/mask_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.mask" do diff --git a/spec/ruby/library/syslog/notice_spec.rb b/spec/ruby/library/syslog/notice_spec.rb index 7a27e23729..f31074f3f6 100644 --- a/spec/ruby/library/syslog/notice_spec.rb +++ b/spec/ruby/library/syslog/notice_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/open_spec.rb b/spec/ruby/library/syslog/open_spec.rb index 18e7f0c80e..424b48d831 100644 --- a/spec/ruby/library/syslog/open_spec.rb +++ b/spec/ruby/library/syslog/open_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/reopen', __FILE__) require 'syslog' @@ -73,8 +74,13 @@ platform_is_not :windows do it "raises an error if the log is opened" do Syslog.open - lambda { Syslog.open}.should raise_error - lambda { Syslog.close; Syslog.open }.should_not raise_error + lambda { + Syslog.open + }.should raise_error(RuntimeError, /syslog already open/) + lambda { + Syslog.close + Syslog.open + }.should_not raise_error Syslog.close end end diff --git a/spec/ruby/library/syslog/opened_spec.rb b/spec/ruby/library/syslog/opened_spec.rb index 82b8ba45f7..1db388fa61 100644 --- a/spec/ruby/library/syslog/opened_spec.rb +++ b/spec/ruby/library/syslog/opened_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.opened?" do diff --git a/spec/ruby/library/syslog/options_spec.rb b/spec/ruby/library/syslog/options_spec.rb index 4a3914531a..145d11a2fb 100644 --- a/spec/ruby/library/syslog/options_spec.rb +++ b/spec/ruby/library/syslog/options_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require 'syslog' describe "Syslog.options" do diff --git a/spec/ruby/library/syslog/reopen_spec.rb b/spec/ruby/library/syslog/reopen_spec.rb index de1ce2c255..49704784e5 100644 --- a/spec/ruby/library/syslog/reopen_spec.rb +++ b/spec/ruby/library/syslog/reopen_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/reopen', __FILE__) require 'syslog' diff --git a/spec/ruby/library/syslog/warning_spec.rb b/spec/ruby/library/syslog/warning_spec.rb index 85fcb3a355..31fa9524f7 100644 --- a/spec/ruby/library/syslog/warning_spec.rb +++ b/spec/ruby/library/syslog/warning_spec.rb @@ -1,5 +1,6 @@ +require File.expand_path('../../../spec_helper', __FILE__) + platform_is_not :windows do - require File.expand_path('../../../spec_helper', __FILE__) require File.expand_path('../shared/log', __FILE__) require 'syslog' |