From 80ba379c242ce1d92005403423717cf0f74a74db Mon Sep 17 00:00:00 2001 From: drbrain Date: Thu, 6 Dec 2012 05:26:46 +0000 Subject: * lib/rubygems/command_manager.rb: Removed string concatenation syntax. [Bug #6265] * lib/rubygems/commands/install_command.rb: ditto * lib/rubygems/commands/uninstall_command.rb: ditto * lib/rubygems/indexer.rb: ditto * lib/rubygems/security/policy.rb: ditto * lib/rubygems/security.rb: ditto * lib/rubygems/uninstaller.rb: ditto * test/rubygems/test_gem_commands_cert_command.rb: ditto * test/rubygems/test_gem_package.rb: ditto * test/rubygems/test_gem_security.rb: ditto * test/rubygems/test_gem_security_policy.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_commands_cert_command.rb | 9 ++++----- test/rubygems/test_gem_package.rb | 6 +++--- test/rubygems/test_gem_security.rb | 4 ++-- test/rubygems/test_gem_security_policy.rb | 20 ++++++++++---------- 4 files changed, 19 insertions(+), 20 deletions(-) (limited to 'test/rubygems') diff --git a/test/rubygems/test_gem_commands_cert_command.rb b/test/rubygems/test_gem_commands_cert_command.rb index d0af46728e..4adbec5e66 100644 --- a/test/rubygems/test_gem_commands_cert_command.rb +++ b/test/rubygems/test_gem_commands_cert_command.rb @@ -441,8 +441,7 @@ ERROR: --private-key not specified and ~/.gem/gem-private_key.pem does not exis @cmd.handle_options %W[--certificate #{nonexistent}] end - assert_equal "invalid argument: " \ - "--certificate #{nonexistent}: does not exist", + assert_equal "invalid argument: --certificate #{nonexistent}: does not exist", e.message bad = File.join @tempdir, 'bad' @@ -452,7 +451,7 @@ ERROR: --private-key not specified and ~/.gem/gem-private_key.pem does not exis @cmd.handle_options %W[--certificate #{bad}] end - assert_equal "invalid argument: " \ + assert_equal "invalid argument: " + "--certificate #{bad}: invalid X509 certificate", e.message end @@ -463,7 +462,7 @@ ERROR: --private-key not specified and ~/.gem/gem-private_key.pem does not exis @cmd.handle_options %W[--private-key #{nonexistent}] end - assert_equal "invalid argument: " \ + assert_equal "invalid argument: " + "--private-key #{nonexistent}: does not exist", e.message @@ -481,7 +480,7 @@ ERROR: --private-key not specified and ~/.gem/gem-private_key.pem does not exis @cmd.handle_options %W[--private-key #{PUBLIC_KEY_FILE}] end - assert_equal "invalid argument: " \ + assert_equal "invalid argument: " + "--private-key #{PUBLIC_KEY_FILE}: private key not found", e.message end diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index a9ac053a5c..9a60d97af9 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -302,7 +302,7 @@ class TestGemPackage < Gem::Package::TarTestCase package.extract_tar_gz tgz_io, @destination end - assert_equal("installing into parent path /absolute.rb of " \ + assert_equal("installing into parent path /absolute.rb of " + "#{@destination} is not allowed", e.message) end @@ -325,7 +325,7 @@ class TestGemPackage < Gem::Package::TarTestCase package.install_location '/absolute.rb', @destination end - assert_equal("installing into parent path /absolute.rb of " \ + assert_equal("installing into parent path /absolute.rb of " + "#{@destination} is not allowed", e.message) end @@ -338,7 +338,7 @@ class TestGemPackage < Gem::Package::TarTestCase parent = File.expand_path File.join @destination, "../relative.rb" - assert_equal("installing into parent path #{parent} of " \ + assert_equal("installing into parent path #{parent} of " + "#{@destination} is not allowed", e.message) end diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb index 7e75548c0f..718b381874 100644 --- a/test/rubygems/test_gem_security.rb +++ b/test/rubygems/test_gem_security.rb @@ -129,7 +129,7 @@ class TestGemSecurity < Gem::TestCase Gem::Security.re_sign CHILD_CERT, CHILD_KEY end - assert_equal "#{ALTERNATE_CERT.subject} is not self-signed, contact " \ + assert_equal "#{ALTERNATE_CERT.subject} is not self-signed, contact " + "#{ALTERNATE_CERT.issuer} to obtain a valid certificate", e.message end @@ -139,7 +139,7 @@ class TestGemSecurity < Gem::TestCase Gem::Security.re_sign ALTERNATE_CERT, PRIVATE_KEY end - assert_equal "incorrect signing key for re-signing " \ + assert_equal "incorrect signing key for re-signing " + "#{ALTERNATE_CERT.subject}", e.message end diff --git a/test/rubygems/test_gem_security_policy.rb b/test/rubygems/test_gem_security_policy.rb index 4b9978c430..22f5375dbf 100644 --- a/test/rubygems/test_gem_security_policy.rb +++ b/test/rubygems/test_gem_security_policy.rb @@ -91,8 +91,8 @@ class TestGemSecurityPolicy < Gem::TestCase @chain.check_chain chain, Time.now end - assert_equal "invalid signing chain: " \ - "certificate #{INVALIDCHILD_CERT.subject} " \ + assert_equal "invalid signing chain: " + + "certificate #{INVALIDCHILD_CERT.subject} " + "was not issued by #{CHILD_CERT.subject}", e.message end @@ -105,7 +105,7 @@ class TestGemSecurityPolicy < Gem::TestCase @low.check_cert EXPIRED_CERT, nil, Time.now end - assert_equal "certificate #{EXPIRED_CERT.subject} " \ + assert_equal "certificate #{EXPIRED_CERT.subject} " + "not valid after #{EXPIRED_CERT.not_after}", e.message end @@ -115,7 +115,7 @@ class TestGemSecurityPolicy < Gem::TestCase @low.check_cert FUTURE_CERT, nil, Time.now end - assert_equal "certificate #{FUTURE_CERT.subject} " \ + assert_equal "certificate #{FUTURE_CERT.subject} " + "not valid before #{FUTURE_CERT.not_before}", e.message end @@ -125,7 +125,7 @@ class TestGemSecurityPolicy < Gem::TestCase @low.check_cert INVALID_ISSUER_CERT, PUBLIC_CERT, Time.now end - assert_equal "certificate #{INVALID_ISSUER_CERT.subject} " \ + assert_equal "certificate #{INVALID_ISSUER_CERT.subject} " + "was not issued by #{PUBLIC_CERT.subject}", e.message end @@ -143,7 +143,7 @@ class TestGemSecurityPolicy < Gem::TestCase @almost_no.check_key(PUBLIC_CERT, ALTERNATE_KEY) end - assert_equal "certificate #{PUBLIC_CERT.subject} " \ + assert_equal "certificate #{PUBLIC_CERT.subject} " + "does not match the signing key", e.message end @@ -160,7 +160,7 @@ class TestGemSecurityPolicy < Gem::TestCase @chain.check_root chain, Time.now end - assert_equal "certificate #{INVALID_SIGNER_CERT.subject} " \ + assert_equal "certificate #{INVALID_SIGNER_CERT.subject} " + "was not issued by #{INVALID_SIGNER_CERT.issuer}", e.message end @@ -172,7 +172,7 @@ class TestGemSecurityPolicy < Gem::TestCase @chain.check_root chain, Time.now end - assert_equal "root certificate #{INVALID_ISSUER_CERT.subject} " \ + assert_equal "root certificate #{INVALID_ISSUER_CERT.subject} " + "is not self-signed (issuer #{INVALID_ISSUER_CERT.issuer})", e.message end @@ -196,7 +196,7 @@ class TestGemSecurityPolicy < Gem::TestCase @high.check_trust [WRONG_KEY_CERT], @sha1, @trust_dir end - assert_equal "trusted root certificate #{PUBLIC_CERT.subject} checksum " \ + assert_equal "trusted root certificate #{PUBLIC_CERT.subject} checksum " + "does not match signing root certificate checksum", e.message end @@ -213,7 +213,7 @@ class TestGemSecurityPolicy < Gem::TestCase @high.check_trust [PUBLIC_CERT, CHILD_CERT], @sha1, @trust_dir end - assert_equal "root cert #{PUBLIC_CERT.subject} is not trusted " \ + assert_equal "root cert #{PUBLIC_CERT.subject} is not trusted " + "(root of signing cert #{CHILD_CERT.subject})", e.message end -- cgit v1.2.3