Update to ruby/spec@bacedc5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2022-11-09 12:17:21 -05:00 · 2017-12-01 15:41:50 +00:00 · 2017-12-01 15:41:50 +00:00 · 4d7b0b9112
commit 4d7b0b9112
parent 821d9a2d30
104 changed files with 2105 additions and 510 deletions
--- 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'

--- 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
--- 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
--- 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'

--- 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'

--- 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'

--- 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'

--- 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
--- 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
--- 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'

--- 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
--- 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
--- 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
--- 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
--- 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'

--- 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
--- 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
--- 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
--- 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'

--- 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'