Removed Solaris conditions from core directory

Author: hsbt

core/dir/home_spec.rb

@@ -60,13 +60,7 @@
   end
 
   describe "when called with the current user name" do
-    platform_is :solaris do
-      it "returns the named user's home directory from the user database" do
-        Dir.home(ENV['USER']).should == `getent passwd #{ENV['USER']}|cut -d: -f6`.chomp
-      end
-    end
-
-    platform_is_not :windows, :solaris, :android, :wasi do
+    platform_is_not :windows, :android, :wasi do
       it "returns the named user's home directory, from the user database" do
         Dir.home(ENV['USER']).should == `echo ~#{ENV['USER']}`.chomp
       end

core/dir/shared/delete.rb

@@ -17,20 +17,10 @@
     Dir.send(@method, p)
   end
 
-  platform_is_not :solaris do
-    it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::ENOTEMPTY)
-    end
-  end
-
-  platform_is :solaris do
-    it "raises an Errno::EEXIST when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::EEXIST)
-    end
+  it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
+    -> do
+      Dir.send @method, DirSpecs.mock_rmdir("nonempty")
+    end.should raise_error(Errno::ENOTEMPTY)
   end
 
   it "raises an Errno::ENOENT when trying to remove a non-existing directory" do

core/file/empty_spec.rb

@@ -4,10 +4,4 @@
 describe "File.empty?" do
   it_behaves_like :file_zero, :empty?, File
   it_behaves_like :file_zero_missing, :empty?, File
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.empty?('/dev/null').should == true
-    end
-  end
 end

core/file/flock_spec.rb

@@ -72,35 +72,3 @@
     end
   end
 end
-
-platform_is :solaris do
-  describe "File#flock on Solaris" do
-    before :each do
-      @name = tmp("flock_test")
-      touch(@name)
-
-      @read_file = File.open @name, "r"
-      @write_file = File.open @name, "w"
-    end
-
-    after :each do
-      @read_file.flock File::LOCK_UN
-      @read_file.close
-      @write_file.flock File::LOCK_UN
-      @write_file.close
-      rm_r @name
-    end
-
-    it "fails with EBADF acquiring exclusive lock on read-only File" do
-      -> do
-        @read_file.flock File::LOCK_EX
-      end.should raise_error(Errno::EBADF)
-    end
-
-    it "fails with EBADF acquiring shared lock on read-only File" do
-      -> do
-        @write_file.flock File::LOCK_SH
-      end.should raise_error(Errno::EBADF)
-    end
-  end
-end

core/file/lchmod_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "File.lchmod" do
-  platform_is_not :linux, :windows, :openbsd, :solaris, :aix do
+  platform_is_not :linux, :windows, :openbsd, :aix do
     before :each do
       @fname = tmp('file_chmod_test')
       @lname = @fname + '.lnk'

core/file/setuid_spec.rb

@@ -26,10 +26,6 @@
 
   platform_is_not :windows do
     it "returns true when the gid bit is set" do
-      platform_is :solaris do
-        # Solaris requires execute bit before setting suid
-        system "chmod u+x #{@name}"
-      end
       system "chmod u+s #{@name}"
 
       File.setuid?(@name).should == true

core/file/stat/rdev_major_spec.rb

@@ -2,19 +2,12 @@
 
 describe "File::Stat#rdev_major" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do

core/file/stat/rdev_minor_spec.rb

@@ -2,19 +2,12 @@
 
 describe "File::Stat#rdev_minor" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do

core/file/zero_spec.rb

@@ -4,10 +4,4 @@
 describe "File.zero?" do
   it_behaves_like :file_zero, :zero?, File
   it_behaves_like :file_zero_missing, :zero?, File
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.zero?('/dev/null').should == true
-    end
-  end
 end

core/filetest/zero_spec.rb

@@ -4,10 +4,4 @@
 describe "FileTest.zero?" do
   it_behaves_like :file_zero, :zero?, FileTest
   it_behaves_like :file_zero_missing, :zero?, FileTest
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.zero?('/dev/null').should == true
-    end
-  end
 end