grntest 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca196b4236185746df0d683e0b9632c4fd1dbaeffa5ed63c4331f73784ccd010
-  data.tar.gz: 3fe5db66385b146d1ea2fa1470141b8e0c884fc9481ac469d4111464e1d340d5
+  metadata.gz: aa40165815d080049dd1910a6e417d10c669225e5b151882192181f830e24347
+  data.tar.gz: d4c4f85b34059a6d8f4c5ed66e4bc60e7294253dcfd8a0f1fc1dbecb42684912
 SHA512:
-  metadata.gz: 207e53bfebdb3366977a9f56546b8d7e83568ce4e459e09c877d377f3b874e219bf0c987db42fb113d0f03ea2501d91376cce1fa0566d157ca1bdbd42570724b
-  data.tar.gz: e46deb249c95770f16782918482c391a475e926936a12670c98fb86e7b5941c7b7596fda39b427ae69541e56dd0b4eef0a178482b28a2f3148687282a58f951f
+  metadata.gz: 595dda68c29ddd69b0cdb5b76c96c3471c811e23d1a0f3a13622d5341ad463db65d0d71a21556675d22e56dc087b167fea64f61886abd9e62d0745a8cf157e13
+  data.tar.gz: bbdf5697336b6e0a7963e7d6b399624829fd3184bf5971c056292a9ac7f9197e28093c980c231772f323e2f072be9a3ceee87021a22d559ee59ffbe4eac3e80a

data/doc/text/news.md

@@ -1,5 +1,24 @@
 # News
 
+## 1.6.3: 2023-09-18
+
+### Improvements
+
+  * reporter: stream: Changed to show worker ID for each test.
+
+  * Added support for backtrace pattern provided by mruby 3.2.0.
+
+### Fixes
+
+  * reporter: stream: Fixed a bug that worker ID isn't outputted.
+
+## 1.6.2: 2023-08-24
+
+### Improvements
+
+  * reporter: stream: Changed to show "start" message in multi-workers
+    mode.
+
 ## 1.6.1: 2023-08-11
 
 ### Improvements

data/lib/grntest/executors/base-executor.rb

@@ -763,6 +763,8 @@ module Grntest
           true
         when /\A[a-zA-Z]:[\/\\]/
           true
+        when "(unknown):0"
+          true
         when /\A\(unknown\):\d+:\d+: /
           true
         when /\A[\w.\\-]+:\d+:\d+: /

data/lib/grntest/reporters/base-reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,11 +28,19 @@ module Grntest
 
       private
       def synchronize
-        @mutex.synchronize do
+        if single_worker?
           yield
+        else
+          @mutex.synchronize do
+            yield
+          end
         end
       end
 
+      def single_worker?
+        @tester.n_workers == 1
+      end
+
       def report_summary(result)
         puts(statistics_header)
         puts(colorize(statistics(result), result))
@@ -120,16 +128,25 @@ module Grntest
         reporter.report
       end
 
+      def report_worker_id(worker)
+        @worker_id_width ||= (Math.log10(@tester.n_workers) + 1).floor
+        print("[%*d] " % [@worker_id_width, worker.id])
+      end
+
+      def report_full_test_name(worker)
+        report_worker_id(worker) unless single_worker?
+        print("#{worker.suite_name}/#{worker.test_name}")
+      end
+
       def report_test(worker, result)
         report_marker(result)
-        print("[#{worker.id}] ") if @tester.n_workers > 1
+        report_worker_id(worker) unless single_worker?
         puts(worker.suite_name)
         print("  #{worker.test_name}")
         report_test_result(result, worker.status)
       end
 
-      def report_test_result(result, label)
-        message = test_result_message(result, label)
+      def report_right_message(message)
         message_width = string_width(message)
         rest_width = @term_width - @current_column
         if rest_width > message_width
@@ -138,6 +155,10 @@ module Grntest
         puts(message)
       end
 
+      def report_test_result(result, label)
+        report_right_message(test_result_message(result, label))
+      end
+
       def test_result_message(result, label)
         elapsed_time = result.elapsed_time
         formatted_elapsed_time = "%.4fs" % elapsed_time

data/lib/grntest/reporters/stream-reporter.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2023  Sutou Kouhei <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,6 +29,7 @@ module Grntest
       end
 
       def on_suite_start(worker)
+        return unless single_worker?
         if worker.suite_name.bytesize <= @term_width
           puts(worker.suite_name)
         else
@@ -40,36 +39,61 @@ module Grntest
       end
 
       def on_test_start(worker)
-        print("  #{worker.test_name}")
-        @output.flush
+        synchronize do
+          if single_worker?
+            print("  #{worker.test_name}")
+          else
+            report_full_test_name(worker)
+            report_right_message("[start]")
+          end
+          @output.flush
+        end
       end
 
       def on_test_success(worker, result)
-        report_test_result(result, worker.status)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+        end
       end
 
       def on_test_failure(worker, result)
-        report_test_result(result, worker.status)
-        report_failure(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_failure(result)
+        end
       end
 
       def on_test_leak(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result) unless result.checked?
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result) unless result.checked?
+        end
       end
 
       def on_test_omission(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result)
+        end
       end
 
       def on_test_omission_suppressed(worker, result)
-        report_test_result(result, worker.status)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+        end
       end
 
       def on_test_no_check(worker, result)
-        report_test_result(result, worker.status)
-        report_actual(result)
+        synchronize do
+          report_full_test_name(worker) unless single_worker?
+          report_test_result(result, worker.status)
+          report_actual(result)
+        end
       end
 
       def on_test_finish(worker, result)

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.6.1"
+  VERSION = "1.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs