print description on exceptions

2 files changed, 12 insertions, 7 deletions

diff --git a/test/assert.rb b/test/assert.rb
index a4918ce23..239730cb9 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -22,17 +22,18 @@ end
 # iso : The ISO reference code of the feature
 #       which will be tested by this
 #       assertion
-def assert(str = 'Assertion failed', iso = 'No ISO')
+def assert(str = 'Assertion failed', iso = '')
   begin
     if(!yield)
-      $asserts.push([str, iso])
+      $asserts.push(['Fail: ', str, iso])
       $ko_test += 1
       print('F')
     else
       $ok_test += 1
       print('.')
     end
-  rescue
+  rescue => e
+    $asserts.push(['Error: ', str, iso, e])
     $kill_test += 1
     print('X')
   end
@@ -43,9 +44,13 @@ end
 # which were reported broken.
 def report()
   print "\n"
-  $asserts.each do |str, iso|
-    print('Fail: ');
+  $asserts.each do |err, str, iso, e|
+    print(err);
     print_assertion_string(str, iso)
+    if e
+      print(" => ")
+      print(e.message)
+    end
     print("\n")
   end
 
diff --git a/test/t/time.rb b/test/t/time.rb
index 98b99f2c2..9ad0e4aff 100644
--- a/test/t/time.rb
+++ b/test/t/time.rb
@@ -23,8 +23,8 @@ assert('Time#initialize_copy', '15.2.19.7.17') do
 end
 
 assert('Time#mday', '15.2.19.7.19') do
-  Time.gm(2012, 12, 23).mday == 23 
-end 
+  Time.gm(2012, 12, 23).mday == 23
+end
 
 assert('Time#month', '15.2.19.7.22') do
   Time.gm(2012, 12, 23).month == 12