Update to ruby/spec@a0b7d0d

2 files changed, 25 insertions, 13 deletions

diff --git a/spec/ruby/core/file/atime_spec.rb b/spec/ruby/core/file/atime_spec.rb
index 047bb0e10e..cef07ba010 100644
--- a/spec/ruby/core/file/atime_spec.rb
+++ b/spec/ruby/core/file/atime_spec.rb
@@ -16,20 +16,17 @@ describe "File.atime" do
   end
 
   platform_is :linux, :windows do
-    ## NOTE also that some Linux systems disable atime (e.g. via mount params) for better filesystem speed.
-    it "returns the last access time for the named file with microseconds" do
-      supports_subseconds = Integer(`stat -c%x '#{__FILE__}'`[/\.(\d+)/, 1], 10)
-      if supports_subseconds != 0
-        expected_time = Time.at(Time.now.to_i + 0.123456)
-        File.utime expected_time, 0, @file
-        # FIXME: A random failing test on Travis ppc64le.
-        # https://bugs.ruby-lang.org/issues/17926
-        if ENV.key?('TRAVIS') && ENV['TRAVIS_CPU_ARCH'] == 'ppc64le'
-          skip '[ruby-core:17926] A random failure on Travis ppc64le'
+    platform_is_not :"powerpc64le-linux" do # https://bugs.ruby-lang.org/issues/17926
+      ## NOTE also that some Linux systems disable atime (e.g. via mount params) for better filesystem speed.
+      it "returns the last access time for the named file with microseconds" do
+        supports_subseconds = Integer(`stat -c%x '#{__FILE__}'`[/\.(\d+)/, 1], 10)
+        if supports_subseconds != 0
+          expected_time = Time.at(Time.now.to_i + 0.123456)
+          File.utime expected_time, 0, @file
+          File.atime(@file).usec.should == expected_time.usec
+        else
+          File.atime(__FILE__).usec.should == 0
         end
-        File.atime(@file).usec.should == expected_time.usec
-      else
-        File.atime(__FILE__).usec.should == 0
       end
     end
   end
diff --git a/spec/ruby/core/file/basename_spec.rb b/spec/ruby/core/file/basename_spec.rb
index 6d7e432086..989409d76b 100644
--- a/spec/ruby/core/file/basename_spec.rb
+++ b/spec/ruby/core/file/basename_spec.rb
@@ -164,5 +164,20 @@ describe "File.basename" do
     basename.encoding.should == Encoding::Windows_1250
   end
 
+  it "returns a new unfrozen String" do
+    exts = [nil, '.rb', '.*', '.txt']
+    ['foo.rb','//', '/test/', 'test'].each do |example|
+      exts.each do |ext|
+        original = example.freeze
+        result = if ext
+                   File.basename(original, ext)
+                 else
+                   File.basename(original)
+                 end
+        result.should_not equal(original)
+        result.frozen?.should == false
+      end
+    end
+  end
 
 end