aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--test/rubygems/test_gem_commands_server_command.rb4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87675e401f..9fe5b8acf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Oct 29 00:39:50 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * test/rubygems/test_gem_commands_server_command.rb
+ (test_handle_options_port): change port from http to discard.
+ Solaris does not include "http 80/tcp" in its default
+ /etc/inet/services. AFAIK, discard (9/tcp) is older than http
+ and it is expected that all OS can resolve the service name.
+ [Bug #10004] [ruby-core:63518]
+
Wed Oct 28 23:52:48 2015 Naohisa Goto <ngotogenome@gmail.com>
* probes_helper.h (RUBY_DTRACE_HOOK): add RB_GC_GUARD, though paranoic.
diff --git a/test/rubygems/test_gem_commands_server_command.rb b/test/rubygems/test_gem_commands_server_command.rb
index db27a4c932..d0782f9a94 100644
--- a/test/rubygems/test_gem_commands_server_command.rb
+++ b/test/rubygems/test_gem_commands_server_command.rb
@@ -37,8 +37,8 @@ class TestGemCommandsServerCommand < Gem::TestCase
@cmd.send :handle_options, %w[-p 65535]
assert_equal 65535, @cmd.options[:port]
- @cmd.send :handle_options, %w[-p http]
- assert_equal 80, @cmd.options[:port]
+ @cmd.send :handle_options, %w[-p discard]
+ assert_equal 9, @cmd.options[:port]
e = assert_raises OptionParser::InvalidArgument do
@cmd.send :handle_options, %w[-p nonexistent]