diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-03-10 12:08:20 +0900 |
---|---|---|
committer | NARUSE, Yui <nurse@users.noreply.github.com> | 2021-03-11 17:24:52 +0900 |
commit | 0476ce0370c1ee56de690d43c15d5e8d7893dedd (patch) | |
tree | 72590a5a0211c53d431cfab4e3b008dbcc3df6e8 /test | |
parent | 7efc7afcae6720e1af7ab49986d789b6f9d6fe0a (diff) |
Merge RubyGems-3.2.14 and Bundler-2.2.14
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_gem_platform.rb | 29 | ||||
-rw-r--r-- | test/rubygems/test_gem_remote_fetcher.rb | 38 |
2 files changed, 38 insertions, 29 deletions
diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index ad7285c082..84754402ad 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -134,9 +134,7 @@ class TestGemPlatform < Gem::TestCase 'i386-solaris2.8' => ['x86', 'solaris', '2.8'], 'mswin32' => ['x86', 'mswin32', nil], 'x86_64-linux' => ['x86_64', 'linux', nil], - 'x86_64-linux-gnu' => ['x86_64', 'linux', nil], 'x86_64-linux-musl' => ['x86_64', 'linux', 'musl'], - 'x86_64-linux-uclibc' => ['x86_64', 'linux', 'uclibc'], 'x86_64-openbsd3.9' => ['x86_64', 'openbsd', '3.9'], 'x86_64-openbsd4.0' => ['x86_64', 'openbsd', '4.0'], 'x86_64-openbsd' => ['x86_64', 'openbsd', nil], @@ -145,7 +143,6 @@ class TestGemPlatform < Gem::TestCase test_cases.each do |arch, expected| platform = Gem::Platform.new arch assert_equal expected, platform.to_a, arch.inspect - assert_equal expected, Gem::Platform.new(platform.to_s).to_a, arch.inspect end end @@ -264,32 +261,6 @@ class TestGemPlatform < Gem::TestCase assert((with_x86_arch === with_nil_arch), 'x86 =~ nil') end - def test_nil_version_is_treated_as_any_version - x86_darwin_8 = Gem::Platform.new 'i686-darwin8.0' - x86_darwin_nil = Gem::Platform.new 'i686-darwin' - - assert((x86_darwin_8 === x86_darwin_nil), '8.0 =~ nil') - assert((x86_darwin_nil === x86_darwin_8), 'nil =~ 8.0') - end - - def test_nil_version_is_stricter_for_linux_os - x86_linux = Gem::Platform.new 'i686-linux' - x86_linux_gnu = Gem::Platform.new 'i686-linux-gnu' - x86_linux_musl = Gem::Platform.new 'i686-linux-musl' - x86_linux_uclibc = Gem::Platform.new 'i686-linux-uclibc' - - assert((x86_linux === x86_linux_gnu), 'linux =~ linux-gnu') - assert((x86_linux_gnu === x86_linux), 'linux-gnu =~ linux') - assert(!(x86_linux_gnu === x86_linux_musl), 'linux-gnu =~ linux-musl') - assert(!(x86_linux_musl === x86_linux_gnu), 'linux-musl =~ linux-gnu') - assert(!(x86_linux_uclibc === x86_linux_musl), 'linux-uclibc =~ linux-musl') - assert(!(x86_linux_musl === x86_linux_uclibc), 'linux-musl =~ linux-uclibc') - assert(!(x86_linux === x86_linux_musl), 'linux =~ linux-musl') - assert(!(x86_linux_musl === x86_linux), 'linux-musl =~ linux') - assert(!(x86_linux === x86_linux_uclibc), 'linux =~ linux-uclibc') - assert(!(x86_linux_uclibc === x86_linux), 'linux-uclibc =~ linux') - end - def test_equals3_cpu_arm arm = Gem::Platform.new 'arm-linux' armv5 = Gem::Platform.new 'armv5-linux' diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 32600deee2..f08579c0cc 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -496,6 +496,44 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== assert_equal url, e.uri end + def test_fetch_path_timeout_error + fetcher = Gem::RemoteFetcher.new nil + @fetcher = fetcher + + def fetcher.fetch_http(uri, mtime = nil, head = nil) + raise Timeout::Error, 'timed out' + end + + url = 'http://example.com/uri' + + e = assert_raises Gem::RemoteFetcher::FetchError do + fetcher.fetch_path url + end + + assert_match %r{Timeout::Error: timed out \(#{Regexp.escape url}\)\z}, + e.message + assert_equal url, e.uri + end + + def test_fetch_path_getaddrinfo_error + fetcher = Gem::RemoteFetcher.new nil + @fetcher = fetcher + + def fetcher.fetch_http(uri, mtime = nil, head = nil) + raise SocketError, 'getaddrinfo: nodename nor servname provided' + end + + url = 'http://example.com/uri' + + e = assert_raises Gem::RemoteFetcher::FetchError do + fetcher.fetch_path url + end + + assert_match %r{SocketError: getaddrinfo: nodename nor servname provided \(#{Regexp.escape url}\)\z}, + e.message + assert_equal url, e.uri + end + def test_fetch_path_openssl_ssl_sslerror fetcher = Gem::RemoteFetcher.new nil @fetcher = fetcher |