diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
commit | 3dc6efbe9ca582d6930f25754a16043dedecfa6f (patch) | |
tree | 35980c7383e9e12d092e0eff78f5f16eca2fa1fc /test/rubygems/test_gem.rb | |
parent | 59a6215af65b3bfade13836681cbacc3294e6e78 (diff) | |
download | ruby-3dc6efbe9ca582d6930f25754a16043dedecfa6f.tar.gz |
Merge rubygems master targeted RubyGems 3.1.0.
https://github.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem.rb')
-rw-r--r-- | test/rubygems/test_gem.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index e740a5ab94..c913f30e27 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -156,7 +156,7 @@ class TestGem < Gem::TestCase end def assert_self_install_permissions - mask = /mingw|mswin/ =~ RUBY_PLATFORM ? 0700 : 0777 + mask = win_platform? ? 0700 : 0777 options = { :dir_mode => 0500, :prog_mode => 0510, @@ -198,6 +198,9 @@ class TestGem < Gem::TestCase 'gems/foo-1/bin/foo.cmd' => prog_mode, 'gems/foo-1/data/foo.txt' => data_mode, } + # below is for intermittent errors on Appveyor & Travis 2019-01, + # see https://github.com/rubygems/rubygems/pull/2568 + sleep 0.2 result = {} Dir.chdir @gemhome do expected.each_key do |n| |