rspec-abq 1.0.7 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0646cb04737a465bc4d6e970f646467c0c99216dbfea158be227a310d1788f
-  data.tar.gz: 23433a92ba1b15d82c4466f1deea8702ea5757aa7c01c73e84e85468430b9227
+  metadata.gz: 03b2ac40b5bb4d24a54abbaeb06c9e3705641cc27b5c247aa86972bf04095af4
+  data.tar.gz: 4d3095d28da6d63731dcd0a64c1c8968033f02155cf0755230e0ebc50854db57
 SHA512:
-  metadata.gz: 4034da120d1294a140edc8ac8f96d2f85aba0e0ea14092a8152f43154634b395391bfd04a80c9191cf7ab58c5b7598855628a144d2b4a73ebe9a7b3798f632dc
-  data.tar.gz: de01483d3b19fc944832eda36f36398dd99cbf41a9cec52c3fb585d8189edeb1546046352db654f87411c6d923209f08820b6ed6eadc4096f20a2f0cd3dab79f
+  metadata.gz: 84005f5d7672dcbc96152d183fe5597f3da8da8d29ed88dc9c83ef5dbd6a70bda68c74589aa24e5e7bb191b43f156760cf4a095457a6059ba19adefe1fa86480
+  data.tar.gz: 493eb56209f8bc6049883a67122fb1ddc55818d7ef326d8d46cd8d40525a4c8003b92b897d36b10d3e3cc11a13112b0cfce9b50f3a63b36e21115be9eca1044f

data/lib/rspec/abq/formatter.rb

@@ -28,28 +28,33 @@ module RSpec
       def self.abq_result(example)
         execution_result = example.execution_result
         tags, meta = Manifest.extract_metadata_and_tags(example.metadata)
-        {
-          test_result: {
-            status: status(example),
-            id: example.id,
-            display_name: example.metadata[:full_description],
-            output: if execution_result.exception
-                      RSpec::Core::Formatters::ExceptionPresenter
-                        .new(execution_result.exception, example)
-                        .fully_formatted(1)
-                    end,
-            runtime: (execution_result.run_time * 1_000_000_000).round,
-            tags: tags,
-            meta: meta,
-            location: {
-              file: example.metadata[:file_path],
-              line: example.metadata[:line_number]
-            },
-            started_at: execution_result.started_at.utc.iso8601,
-            finished_at: execution_result.finished_at.utc.iso8601,
-            lineage: RSpec::Core::Metadata.ascend(example.metadata).map { |meta| meta[:description] }.reverse
-          }
+        test_result = {
+          status: status(example),
+          id: example.id,
+          display_name: example.metadata[:full_description],
+          output: if execution_result.exception
+                    RSpec::Core::Formatters::ExceptionPresenter
+                      .new(execution_result.exception, example)
+                      .fully_formatted(1)
+                  end,
+          runtime: (execution_result.run_time * 1_000_000_000).round,
+          tags: tags,
+          meta: meta,
+          location: {
+            file: example.metadata[:file_path],
+            line: example.metadata[:line_number]
+          },
+          started_at: execution_result.started_at.utc.iso8601,
+          finished_at: execution_result.finished_at.utc.iso8601,
+          lineage: RSpec::Core::Metadata.ascend(example.metadata).map { |meta| meta[:description] }.reverse
         }
+
+        past_rspec_retry_attempts = rspec_retry_attempts(example)
+        if past_rspec_retry_attempts
+          test_result[:past_attempts] = past_rspec_retry_attempts
+        end
+
+        {test_result: test_result}
       end
 
       private_class_method def self.status(example)
@@ -82,6 +87,27 @@ module RSpec
           end
         end
       end
+
+      private_class_method def self.rspec_retry_attempts(example)
+        return unless defined?(RSpec::Retry)
+        return unless example.metadata.key?(:retry_attempts)
+        return unless example.metadata.key?(:retry_exceptions)
+
+        retry_attempts = example.metadata[:retry_attempts]
+        retry_exceptions = example.metadata[:retry_exceptions]
+        return unless retry_attempts > 0
+
+        retry_attempts.times.map do |attempt_index|
+          {
+            status: {type: :failure},
+            id: example.id,
+            display_name: example.metadata[:full_description],
+            output: retry_exceptions[attempt_index],
+            runtime: 0, # rspec-retry does not expose individual durations
+            meta: {} # rspec-retry exposes no other metadata beyond attempt and exceptions
+          }
+        end
+      end
     end
   end
 end

data/lib/rspec/abq/version.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Abq
     # current version!
-    VERSION = "1.0.7"
+    VERSION = "1.1.1"
   end
 end

data/lib/rspec/abq.rb

@@ -148,8 +148,20 @@ module RSpec
       Extensions.setup!
     end
 
+    # Base ABQ error.
+    Error = Class.new(StandardError)
+
     # raised when check_configuration fails
-    UnsupportedConfigurationError = Class.new(StandardError)
+    UnsupportedConfigurationError = Class.new(Error)
+
+    # Failed to connect and initialize handshake.
+    ConnectionFailed = Class.new(Error)
+
+    # Communication between abq sockets follows the following protocol:
+    #   - The first 4 bytes an unsigned 32-bit integer (big-endian) representing
+    #     the size of the rest of the message.
+    #   - The rest of the message is a JSON-encoded payload.
+    ConnectionBroken = Class.new(Error)
 
     # raises if RSpec is configured in a way that's incompatible with rspec-abq
     def self.check_configuration!(config)
@@ -214,12 +226,16 @@ module RSpec
 
     # Creates the socket to communicate with the worker and sends the worker the protocol
     # @!visibility private
-    def self.socket
-      @socket ||= TCPSocket.new(*ENV[ABQ_SOCKET].split(":")).tap do |socket|
-        # Messages sent to/received from the ABQ worker should be done so ASAP.
-        # Since we're on a local network, we don't care about packet reduction here.
-        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        protocol_write(NATIVE_RUNNER_SPAWNED_MESSAGE, socket)
+    def self.socket(connect_timeout: 5)
+      @socket ||= begin
+        Socket.tcp(*ENV[ABQ_SOCKET].split(":"), connect_timeout: connect_timeout).tap do |socket|
+          # Messages sent to/received from the ABQ worker should be done so ASAP.
+          # Since we're on a local network, we don't care about packet reduction here.
+          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+          protocol_write(NATIVE_RUNNER_SPAWNED_MESSAGE, socket)
+        end
+      rescue
+        raise ConnectionFailed, "Unable to connect to ABQ socket #{ENV[ABQ_SOCKET]}"
       end
     end
 
@@ -245,25 +261,18 @@ module RSpec
         end
     end
 
-    # Communication between abq sockets follows the following protocol:
-    #   - The first 4 bytes an unsigned 32-bit integer (big-endian) representing
-    #     the size of the rest of the message.
-    #   - The rest of the message is a JSON-encoded payload.
-    class AbqConnBroken < StandardError
-    end
-
     # Writes a message to an Abq socket using the 4-byte header protocol.
     #
     # @param socket [TCPSocket]
     # @param msg
     def self.protocol_write(msg, socket = Abq.socket)
       json_msg = JSON.dump msg
-      begin
-        socket.write [json_msg.bytesize].pack("N")
-        socket.write json_msg
-      rescue
-        raise AbqConnBroken
-      end
+      socket.write [json_msg.bytesize].pack("N")
+      socket.write json_msg
+    rescue SystemCallError, IOError
+      raise ConnectionBroken
+    rescue
+      raise Error
     end
 
     # Writes a message to an Abq socket using the 4-byte header protocol.
@@ -273,10 +282,16 @@ module RSpec
     def self.protocol_read(socket = Abq.socket)
       len_bytes = socket.read 4
       return :abq_done if len_bytes.nil?
+
       len = len_bytes.unpack1("N")
       json_msg = socket.read len
       return :abq_done if json_msg.nil?
+
       JSON.parse json_msg
+    rescue SystemCallError, IOError
+      raise ConnectionBroken
+    rescue
+      raise Error
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-abq
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.1
 platform: ruby
 authors:
 - Ayaz Hafiz
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core