Update to ruby/spec@ab32a1a

9 files changed, 261 insertions, 69 deletions

diff --git a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
index 3100511dc9..612430e067 100644
--- a/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
+++ b/spec/ruby/library/objectspace/trace_object_allocations_spec.rb
@@ -128,4 +128,22 @@ describe "ObjectSpace.trace_object_allocations" do
       ObjectSpace.trace_object_allocations_stop
     end
   end
+
+  it "returns nil for class_path, generation, method_id, sourcefile, and sourceline for immutable objects" do
+    ObjectSpace.trace_object_allocations_start
+    begin
+      one = nil
+      two = 42
+      three = :foo
+      [one, two, three].each do |i|
+        ObjectSpace.allocation_class_path(i).should == nil
+        ObjectSpace.allocation_generation(i).should == nil
+        ObjectSpace.allocation_method_id(i).should == nil
+        ObjectSpace.allocation_sourcefile(i).should == nil
+        ObjectSpace.allocation_sourceline(i).should == nil
+      end
+    ensure
+      ObjectSpace.trace_object_allocations_stop
+    end
+  end
 end
diff --git a/spec/ruby/library/openssl/x509/name/verify_spec.rb b/spec/ruby/library/openssl/x509/name/verify_spec.rb
new file mode 100644
index 0000000000..f5384f5764
--- /dev/null
+++ b/spec/ruby/library/openssl/x509/name/verify_spec.rb
@@ -0,0 +1,78 @@
+require_relative '../../../../spec_helper'
+require 'openssl'
+
+describe "OpenSSL::X509::Name.verify" do
+  it "returns true for valid certificate" do
+    key = OpenSSL::PKey::RSA.new 2048
+    cert = OpenSSL::X509::Certificate.new
+    cert.version = 2
+    cert.serial = 1
+    cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=truffleruby/CN=TruffleRuby CA"
+    cert.issuer = cert.subject
+    cert.public_key = key.public_key
+    cert.not_before = Time.now
+    cert.not_after = cert.not_before + 365 * 24 * 60 * 60
+    cert.sign key, OpenSSL::Digest.new('SHA1')
+    store = OpenSSL::X509::Store.new
+    store.add_cert(cert)
+    store.verify(cert).should == true
+  end
+
+  it "returns false for an expired certificate" do
+    key = OpenSSL::PKey::RSA.new 2048
+    cert = OpenSSL::X509::Certificate.new
+    cert.version = 2
+    cert.serial = 1
+    cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=truffleruby/CN=TruffleRuby CA"
+    cert.issuer = cert.subject
+    cert.public_key = key.public_key
+    cert.not_before = Time.now - 10
+    cert.not_after = Time.now - 5
+    cert.sign key, OpenSSL::Digest.new('SHA1')
+    store = OpenSSL::X509::Store.new
+    store.add_cert(cert)
+    store.verify(cert).should == false
+  end
+
+  it "returns false for an expired root certificate" do
+    root_key = OpenSSL::PKey::RSA.new 2048
+    root_cert = OpenSSL::X509::Certificate.new
+    root_cert.version = 2
+    root_cert.serial = 1
+    root_cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=truffleruby/CN=TruffleRuby CA"
+    root_cert.issuer = root_cert.subject
+    root_cert.public_key = root_key.public_key
+    root_cert.not_before = Time.now - 10
+    root_cert.not_after = Time.now - 5
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.subject_certificate = root_cert
+    ef.issuer_certificate = root_cert
+    root_cert.add_extension(ef.create_extension("basicConstraints","CA:TRUE",true))
+    root_cert.add_extension(ef.create_extension("keyUsage","keyCertSign, cRLSign", true))
+    root_cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
+    root_cert.add_extension(ef.create_extension("authorityKeyIdentifier","keyid:always",false))
+    root_cert.sign(root_key, OpenSSL::Digest.new('SHA256'))
+
+
+    key = OpenSSL::PKey::RSA.new 2048
+    cert = OpenSSL::X509::Certificate.new
+    cert.version = 2
+    cert.serial = 2
+    cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=truffleruby/CN=TruffleRuby certificate"
+    cert.issuer = root_cert.subject
+    cert.public_key = key.public_key
+    cert.not_before = Time.now
+    cert.not_after = cert.not_before + 1 * 365 * 24 * 60 * 60
+    ef = OpenSSL::X509::ExtensionFactory.new
+    ef.subject_certificate = cert
+    ef.issuer_certificate = root_cert
+    cert.add_extension(ef.create_extension("keyUsage","digitalSignature", true))
+    cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
+    cert.sign(root_key, OpenSSL::Digest.new('SHA256'))
+
+    store = OpenSSL::X509::Store.new
+    store.add_cert(root_cert)
+    store.add_cert(cert)
+    store.verify(cert).should == false
+  end
+end
diff --git a/spec/ruby/library/stringio/each_line_spec.rb b/spec/ruby/library/stringio/each_line_spec.rb
index 1389408399..c68f7dae82 100644
--- a/spec/ruby/library/stringio/each_line_spec.rb
+++ b/spec/ruby/library/stringio/each_line_spec.rb
@@ -17,3 +17,7 @@ end
 describe "StringIO#each_line when passed chomp" do
   it_behaves_like :stringio_each_chomp, :each_line
 end
+
+describe "StringIO#each_line when passed limit" do
+  it_behaves_like :stringio_each_limit, :each_line
+end
diff --git a/spec/ruby/library/stringio/each_spec.rb b/spec/ruby/library/stringio/each_spec.rb
index a76460049b..2c30ed5cda 100644
--- a/spec/ruby/library/stringio/each_spec.rb
+++ b/spec/ruby/library/stringio/each_spec.rb
@@ -17,3 +17,11 @@ end
 describe "StringIO#each when passed chomp" do
   it_behaves_like :stringio_each_chomp, :each
 end
+
+describe "StringIO#each when passed chomp" do
+  it_behaves_like :stringio_each_separator_and_chomp, :each
+end
+
+describe "StringIO#each when passed limit" do
+  it_behaves_like :stringio_each_limit, :each
+end
diff --git a/spec/ruby/library/stringio/gets_spec.rb b/spec/ruby/library/stringio/gets_spec.rb
index 97429e6a29..d597ec0e45 100644
--- a/spec/ruby/library/stringio/gets_spec.rb
+++ b/spec/ruby/library/stringio/gets_spec.rb
@@ -171,6 +171,10 @@ describe "StringIO#gets when passed [limit]" do
   it "returns a blank string when passed a limit of 0" do
     @io.gets(0).should == ""
   end
+
+  it "ignores it when passed a negative limit" do
+    @io.gets(-4).should == "this>is>an>example"
+  end
 end
 
 describe "StringIO#gets when passed [separator] and [limit]" do
diff --git a/spec/ruby/library/stringio/readline_spec.rb b/spec/ruby/library/stringio/readline_spec.rb
index 94b67bc92d..b794e5fade 100644
--- a/spec/ruby/library/stringio/readline_spec.rb
+++ b/spec/ruby/library/stringio/readline_spec.rb
@@ -128,3 +128,23 @@ describe "StringIO#readline when passed [chomp]" do
     io.readline(chomp: true).should == "this>is>an>example"
   end
 end
+
+describe "StringIO#readline when passed [limit]" do
+  before :each do
+    @io = StringIO.new("this>is>an>example")
+  end
+
+  it "returns the data read until the limit is met" do
+    io = StringIO.new("this>is>an>example\n")
+    io.readline(3).should == "thi"
+  end
+
+  it "returns a blank string when passed a limit of 0" do
+    @io.readline(0).should == ""
+  end
+
+  it "ignores it when the limit is negative" do
+    seen = []
+    @io.readline(-4).should == "this>is>an>example"
+  end
+end
diff --git a/spec/ruby/library/stringio/readlines_spec.rb b/spec/ruby/library/stringio/readlines_spec.rb
index 4b007787e2..c471d0fd73 100644
--- a/spec/ruby/library/stringio/readlines_spec.rb
+++ b/spec/ruby/library/stringio/readlines_spec.rb
@@ -98,3 +98,21 @@ describe "StringIO#readlines when passed [chomp]" do
     io.readlines(chomp: true).should == ["this>is", "an>example"]
   end
 end
+
+describe "StringIO#readlines when passed [limit]" do
+  before :each do
+    @io = StringIO.new("a b c d e\n1 2 3 4 5")
+  end
+
+  it "returns the data read until the limit is met" do
+    @io.readlines(4).should == ["a b ", "c d ", "e\n", "1 2 ", "3 4 ", "5"]
+  end
+
+  it "raises ArgumentError when limit is 0" do
+    -> { @io.readlines(0) }.should raise_error(ArgumentError)
+  end
+
+  it "ignores it when the limit is negative" do
+    @io.readlines(-4).should == ["a b c d e\n", "1 2 3 4 5"]
+  end
+end
diff --git a/spec/ruby/library/stringio/shared/each.rb b/spec/ruby/library/stringio/shared/each.rb
index 3be6661ce5..bf3265ee46 100644
--- a/spec/ruby/library/stringio/shared/each.rb
+++ b/spec/ruby/library/stringio/shared/each.rb
@@ -123,4 +123,41 @@ describe :stringio_each_chomp, shared: true do
     io.send(@method, chomp: true) {|s| seen << s }
     seen.should == ["a b \rc d e", "1 2 3 4 5", "the end"]
   end
+
+  it "returns each line with removed newline characters when called without block" do
+    seen = []
+    io = StringIO.new("a b \rc d e\n1 2 3 4 5\r\nthe end")
+    enum = io.send(@method, chomp: true)
+    enum.each {|s| seen << s }
+    seen.should == ["a b \rc d e", "1 2 3 4 5", "the end"]
+  end
+end
+
+describe :stringio_each_separator_and_chomp, shared: true do
+  it "yields each line with removed separator to the passed block" do
+    seen = []
+    io = StringIO.new("a b \nc d e|1 2 3 4 5\n|the end")
+    io.send(@method, "|", chomp: true) {|s| seen << s }
+    seen.should == ["a b \nc d e", "1 2 3 4 5\n", "the end"]
+  end
+
+  it "returns each line with removed separator when called without block" do
+    seen = []
+    io = StringIO.new("a b \nc d e|1 2 3 4 5\n|the end")
+    enum = io.send(@method, "|", chomp: true)
+    enum.each {|s| seen << s }
+    seen.should == ["a b \nc d e", "1 2 3 4 5\n", "the end"]
+  end
+end
+
+describe :stringio_each_limit, shared: true do
+  before :each do
+    @io = StringIO.new("a b c d e\n1 2 3 4 5")
+  end
+
+  it "returns the data read until the limit is met" do
+    seen = []
+    @io.send(@method, 4) { |s| seen << s }
+    seen.should == ["a b ", "c d ", "e\n", "1 2 ", "3 4 ", "5"]
+  end
 end
diff --git a/spec/ruby/library/zlib/crc_table_spec.rb b/spec/ruby/library/zlib/crc_table_spec.rb
index f7fc2749fa..de8876086b 100644
--- a/spec/ruby/library/zlib/crc_table_spec.rb
+++ b/spec/ruby/library/zlib/crc_table_spec.rb
@@ -2,74 +2,79 @@ require_relative '../../spec_helper'
 require "zlib"
 
 describe "Zlib.crc_table" do
-
-  it "returns the same value as zlib's get_crc_table()" do
-    Zlib.crc_table.should == [
-      0, 1996959894, 3993919788, 2567524794,
-      124634137, 1886057615, 3915621685, 2657392035,
-      249268274, 2044508324, 3772115230, 2547177864,
-      162941995, 2125561021, 3887607047, 2428444049,
-      498536548, 1789927666, 4089016648, 2227061214,
-      450548861, 1843258603, 4107580753, 2211677639,
-      325883990, 1684777152, 4251122042, 2321926636,
-      335633487, 1661365465, 4195302755, 2366115317,
-      997073096, 1281953886, 3579855332, 2724688242,
-      1006888145, 1258607687, 3524101629, 2768942443,
-      901097722, 1119000684, 3686517206, 2898065728,
-      853044451, 1172266101, 3705015759, 2882616665,
-      651767980, 1373503546, 3369554304, 3218104598,
-      565507253, 1454621731, 3485111705, 3099436303,
-      671266974, 1594198024, 3322730930, 2970347812,
-      795835527, 1483230225, 3244367275, 3060149565,
-      1994146192, 31158534, 2563907772, 4023717930,
-      1907459465, 112637215, 2680153253, 3904427059,
-      2013776290, 251722036, 2517215374, 3775830040,
-      2137656763, 141376813, 2439277719, 3865271297,
-      1802195444, 476864866, 2238001368, 4066508878,
-      1812370925, 453092731, 2181625025, 4111451223,
-      1706088902, 314042704, 2344532202, 4240017532,
-      1658658271, 366619977, 2362670323, 4224994405,
-      1303535960, 984961486, 2747007092, 3569037538,
-      1256170817, 1037604311, 2765210733, 3554079995,
-      1131014506, 879679996, 2909243462, 3663771856,
-      1141124467, 855842277, 2852801631, 3708648649,
-      1342533948, 654459306, 3188396048, 3373015174,
-      1466479909, 544179635, 3110523913, 3462522015,
-      1591671054, 702138776, 2966460450, 3352799412,
-      1504918807, 783551873, 3082640443, 3233442989,
-      3988292384, 2596254646, 62317068, 1957810842,
-      3939845945, 2647816111, 81470997, 1943803523,
-      3814918930, 2489596804, 225274430, 2053790376,
-      3826175755, 2466906013, 167816743, 2097651377,
-      4027552580, 2265490386, 503444072, 1762050814,
-      4150417245, 2154129355, 426522225, 1852507879,
-      4275313526, 2312317920, 282753626, 1742555852,
-      4189708143, 2394877945, 397917763, 1622183637,
-      3604390888, 2714866558, 953729732, 1340076626,
-      3518719985, 2797360999, 1068828381, 1219638859,
-      3624741850, 2936675148, 906185462, 1090812512,
-      3747672003, 2825379669, 829329135, 1181335161,
-      3412177804, 3160834842, 628085408, 1382605366,
-      3423369109, 3138078467, 570562233, 1426400815,
-      3317316542, 2998733608, 733239954, 1555261956,
-      3268935591, 3050360625, 752459403, 1541320221,
-      2607071920, 3965973030, 1969922972, 40735498,
-      2617837225, 3943577151, 1913087877, 83908371,
-      2512341634, 3803740692, 2075208622, 213261112,
-      2463272603, 3855990285, 2094854071, 198958881,
-      2262029012, 4057260610, 1759359992, 534414190,
-      2176718541, 4139329115, 1873836001, 414664567,
-      2282248934, 4279200368, 1711684554, 285281116,
-      2405801727, 4167216745, 1634467795, 376229701,
-      2685067896, 3608007406, 1308918612, 956543938,
-      2808555105, 3495958263, 1231636301, 1047427035,
-      2932959818, 3654703836, 1088359270, 936918000,
-      2847714899, 3736837829, 1202900863, 817233897,
-      3183342108, 3401237130, 1404277552, 615818150,
-      3134207493, 3453421203, 1423857449, 601450431,
-      3009837614, 3294710456, 1567103746, 711928724,
-      3020668471, 3272380065, 1510334235, 755167117,
-    ]
+  # This spec fails when zlib.h and libz.so are not from the same version.
+  # In older zlib (< 1.2.7 it seems), get_crc_table() is stored as u64[],
+  # but in newer zlib, get_crc_table() is stored as u32[].
+  # Technically, there is ABI breakage between those zlib versions,
+  # but get_crc_table() is an "undocumented function" according to zlib.h.
+  guard -> { ENV["RUBY_SPEC_TEST_ZLIB_CRC_TABLE"] != "false" } do
+    it "returns the same value as zlib's get_crc_table()" do
+      Zlib.crc_table.should == [
+        0, 1996959894, 3993919788, 2567524794,
+        124634137, 1886057615, 3915621685, 2657392035,
+        249268274, 2044508324, 3772115230, 2547177864,
+        162941995, 2125561021, 3887607047, 2428444049,
+        498536548, 1789927666, 4089016648, 2227061214,
+        450548861, 1843258603, 4107580753, 2211677639,
+        325883990, 1684777152, 4251122042, 2321926636,
+        335633487, 1661365465, 4195302755, 2366115317,
+        997073096, 1281953886, 3579855332, 2724688242,
+        1006888145, 1258607687, 3524101629, 2768942443,
+        901097722, 1119000684, 3686517206, 2898065728,
+        853044451, 1172266101, 3705015759, 2882616665,
+        651767980, 1373503546, 3369554304, 3218104598,
+        565507253, 1454621731, 3485111705, 3099436303,
+        671266974, 1594198024, 3322730930, 2970347812,
+        795835527, 1483230225, 3244367275, 3060149565,
+        1994146192, 31158534, 2563907772, 4023717930,
+        1907459465, 112637215, 2680153253, 3904427059,
+        2013776290, 251722036, 2517215374, 3775830040,
+        2137656763, 141376813, 2439277719, 3865271297,
+        1802195444, 476864866, 2238001368, 4066508878,
+        1812370925, 453092731, 2181625025, 4111451223,
+        1706088902, 314042704, 2344532202, 4240017532,
+        1658658271, 366619977, 2362670323, 4224994405,
+        1303535960, 984961486, 2747007092, 3569037538,
+        1256170817, 1037604311, 2765210733, 3554079995,
+        1131014506, 879679996, 2909243462, 3663771856,
+        1141124467, 855842277, 2852801631, 3708648649,
+        1342533948, 654459306, 3188396048, 3373015174,
+        1466479909, 544179635, 3110523913, 3462522015,
+        1591671054, 702138776, 2966460450, 3352799412,
+        1504918807, 783551873, 3082640443, 3233442989,
+        3988292384, 2596254646, 62317068, 1957810842,
+        3939845945, 2647816111, 81470997, 1943803523,
+        3814918930, 2489596804, 225274430, 2053790376,
+        3826175755, 2466906013, 167816743, 2097651377,
+        4027552580, 2265490386, 503444072, 1762050814,
+        4150417245, 2154129355, 426522225, 1852507879,
+        4275313526, 2312317920, 282753626, 1742555852,
+        4189708143, 2394877945, 397917763, 1622183637,
+        3604390888, 2714866558, 953729732, 1340076626,
+        3518719985, 2797360999, 1068828381, 1219638859,
+        3624741850, 2936675148, 906185462, 1090812512,
+        3747672003, 2825379669, 829329135, 1181335161,
+        3412177804, 3160834842, 628085408, 1382605366,
+        3423369109, 3138078467, 570562233, 1426400815,
+        3317316542, 2998733608, 733239954, 1555261956,
+        3268935591, 3050360625, 752459403, 1541320221,
+        2607071920, 3965973030, 1969922972, 40735498,
+        2617837225, 3943577151, 1913087877, 83908371,
+        2512341634, 3803740692, 2075208622, 213261112,
+        2463272603, 3855990285, 2094854071, 198958881,
+        2262029012, 4057260610, 1759359992, 534414190,
+        2176718541, 4139329115, 1873836001, 414664567,
+        2282248934, 4279200368, 1711684554, 285281116,
+        2405801727, 4167216745, 1634467795, 376229701,
+        2685067896, 3608007406, 1308918612, 956543938,
+        2808555105, 3495958263, 1231636301, 1047427035,
+        2932959818, 3654703836, 1088359270, 936918000,
+        2847714899, 3736837829, 1202900863, 817233897,
+        3183342108, 3401237130, 1404277552, 615818150,
+        3134207493, 3453421203, 1423857449, 601450431,
+        3009837614, 3294710456, 1567103746, 711928724,
+        3020668471, 3272380065, 1510334235, 755167117,
+      ]
+    end
   end
-
 end