summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-01 15:52:48 +0000
committerayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-01 15:52:48 +0000
commitaea9c733e83800909730871bdf6b1bf48016846d (patch)
tree2ff1698b6b5fab357d6682bac0b6f2845ca357d7
parentebbd0df5ece8a597caa5630620fc6a089a06c5ea (diff)
* test/psych/test_yamldbm.rb: avoid platform dependency.
patch by Naohisa Goto. [ruby-dev:44763] [Bug #5535] * test/syck/test_yamldbm.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/psych/test_yamldbm.rb8
-rw-r--r--test/syck/test_yamldbm.rb8
3 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index b5cd9f25513..0b36549dd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 02 00:43:59 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+
+ * test/psych/test_yamldbm.rb: avoid platform dependency.
+ patch by Naohisa Goto. [ruby-dev:44763] [Bug #5535]
+ * test/syck/test_yamldbm.rb: ditto.
+
Wed Nov 2 00:14:15 2011 Shugo Maeda <shugo@ruby-lang.org>
* test/ruby/test_marshal.rb: renamed methods duplicated with those
diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb
index c60a18febe9..5fd2d77ed6f 100644
--- a/test/psych/test_yamldbm.rb
+++ b/test/psych/test_yamldbm.rb
@@ -48,7 +48,7 @@ module Psych
def test_to_a
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal([['a','b'],['c','d']], @yamldbm.to_a)
+ assert_equal([['a','b'],['c','d']], @yamldbm.to_a.sort)
end
def test_to_hash
@@ -97,8 +97,8 @@ module Psych
def test_shift
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal(['a','b'], @yamldbm.shift)
- assert_equal(['c','d'], @yamldbm.shift)
+ assert_equal([['a','b'], ['c','d']],
+ [@yamldbm.shift, @yamldbm.shift].sort)
assert_nil @yamldbm.shift
end
@@ -166,7 +166,7 @@ module Psych
assert_equal [], @yamldbm.values
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal ['b','d'], @yamldbm.values
+ assert_equal ['b','d'], @yamldbm.values.sort
end
def test_values_at
diff --git a/test/syck/test_yamldbm.rb b/test/syck/test_yamldbm.rb
index a4a3afb66af..a736f20a337 100644
--- a/test/syck/test_yamldbm.rb
+++ b/test/syck/test_yamldbm.rb
@@ -48,7 +48,7 @@ module Syck
def test_to_a
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal([['a','b'],['c','d']], @yamldbm.to_a)
+ assert_equal([['a','b'],['c','d']], @yamldbm.to_a.sort)
end
def test_to_hash
@@ -97,8 +97,8 @@ module Syck
def test_shift
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal(['a','b'], @yamldbm.shift)
- assert_equal(['c','d'], @yamldbm.shift)
+ assert_equal([['a','b'], ['c','d']],
+ [@yamldbm.shift, @yamldbm.shift].sort)
assert_nil @yamldbm.shift
end
@@ -166,7 +166,7 @@ module Syck
assert_equal [], @yamldbm.values
@yamldbm['a'] = 'b'
@yamldbm['c'] = 'd'
- assert_equal ['b','d'], @yamldbm.values
+ assert_equal ['b','d'], @yamldbm.values.sort
end
def test_values_at