inferno_core 0.1.0 → 0.1.2

data/lib/inferno/repositories/results.rb

@@ -140,6 +140,10 @@ module Inferno
         update(result_id, result: 'pass', result_message: message)
       end
 
+      def cancel_waiting_result(result_id, message = nil)
+        update(result_id, result: 'cancel', result_message: message)
+      end
+
       def json_serializer_options
         {
           include: {

data/lib/inferno/repositories/session_data.rb

@@ -54,7 +54,7 @@ module Inferno
         return nil if params[:value].blank?
 
         case params[:type]&.to_s
-        when 'text', 'textarea'
+        when 'text', 'textarea', 'radio'
           params[:value].to_s
         when 'oauth_credentials'
           credentials =

data/lib/inferno/repositories/test_runs.rb

@@ -65,6 +65,10 @@ module Inferno
         build_entity(test_run_hash)
       end
 
+      def status_for_test_run(id)
+        self.class::Model.where(id: id).get(:status)
+      end
+
       def mark_as_running(test_run_id)
         update(test_run_id, status: 'running')
       end
@@ -91,6 +95,10 @@ module Inferno
         )
       end
 
+      def mark_as_cancelling(test_run_id)
+        update(test_run_id, status: 'cancelling')
+      end
+
       class Model < Sequel::Model(db)
         include ValidateRunnableReference
 

data/lib/inferno/result_summarizer.rb

@@ -0,0 +1,40 @@
+module Inferno
+  # @private
+  # This class takes an array of results and determines the overall result. This
+  # is used to determine the result of a TestGroup/TestSuite based on the
+  # results of it's children.
+  class ResultSummarizer
+    attr_reader :results
+
+    def initialize(results)
+      @results = results
+    end
+
+    def summarize
+      prioritized_result_strings.find { |result_string| unique_result_strings.include? result_string }
+    end
+
+    private
+
+    def prioritized_result_strings
+      Entities::Result::RESULT_OPTIONS
+    end
+
+    def required_results
+      @required_results ||= results.select(&:required?)
+    end
+
+    def all_optional_results?
+      required_results.blank?
+    end
+
+    def results_for_summary
+      all_optional_results? ? results : required_results
+    end
+
+    def unique_result_strings
+      @unique_result_strings ||=
+        results_for_summary.map(&:result).uniq
+    end
+  end
+end

data/lib/inferno/test_runner.rb

@@ -1,3 +1,4 @@
+require_relative './result_summarizer'
 require_relative './utils/markdown_formatter'
 
 module Inferno
@@ -28,8 +29,13 @@ module Inferno
       @session_data_repo ||= Repositories::SessionData.new
     end
 
+    def test_run_is_cancelling
+      # forces db refetch of the test run status in case it is being cancelled
+      test_runs_repo.status_for_test_run(test_run.id) == 'cancelling'
+    end
+
     def start
-      test_runs_repo.mark_as_running(test_run.id)
+      test_runs_repo.mark_as_running(test_run.id) unless test_run.status == 'cancelling'
 
       run(test_run.runnable)
 
@@ -59,6 +65,8 @@ module Inferno
       test_instance = test.new(inputs: inputs, test_session_id: test_session.id, scratch: scratch)
 
       result = begin
+        raise Exceptions::CancelException, 'Test cancelled by user' if test_run_is_cancelling
+
         test_instance.load_named_requests
         test_instance.instance_eval(&test.block)
         'pass'
@@ -120,7 +128,9 @@ module Inferno
 
       children = parent.children
       child_results = results_repo.current_results_for_test_session_and_runnables(test_session.id, children)
-      return if children.length != child_results.length
+      required_children = children.select(&:required?)
+      required_results = child_results.select(&:required?)
+      return if required_children.length != required_results.length
 
       old_result = results_repo.current_result_for_test_session(test_session.id, parent.reference_hash)&.result
       new_result = roll_up_result(child_results)
@@ -170,11 +180,7 @@ module Inferno
     end
 
     def roll_up_result(results)
-      result_priority = Entities::Result::RESULT_OPTIONS
-      unique_results = results.map(&:result).uniq
-      result_priority.find do |result|
-        unique_results.include? result
-      end
+      ResultSummarizer.new(results).summarize
     end
   end
 end

data/lib/inferno/version.rb

@@ -1,3 +1,3 @@
 module Inferno
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferno_core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Stephen MacVicar
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -242,14 +242,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -466,6 +466,7 @@ files:
 - lib/inferno/apps/web/controllers/controller.rb
 - lib/inferno/apps/web/controllers/requests/show.rb
 - lib/inferno/apps/web/controllers/test_runs/create.rb
+- lib/inferno/apps/web/controllers/test_runs/destroy.rb
 - lib/inferno/apps/web/controllers/test_runs/results/index.rb
 - lib/inferno/apps/web/controllers/test_runs/show.rb
 - lib/inferno/apps/web/controllers/test_sessions/create.rb
@@ -520,6 +521,7 @@ files:
 - lib/inferno/entities.rb
 - lib/inferno/entities/attributes.rb
 - lib/inferno/entities/entity.rb
+- lib/inferno/entities/has_runnable.rb
 - lib/inferno/entities/header.rb
 - lib/inferno/entities/message.rb
 - lib/inferno/entities/request.rb
@@ -557,6 +559,7 @@ files:
 - lib/inferno/repositories/test_suites.rb
 - lib/inferno/repositories/tests.rb
 - lib/inferno/repositories/validate_runnable_reference.rb
+- lib/inferno/result_summarizer.rb
 - lib/inferno/spec_support.rb
 - lib/inferno/test_runner.rb
 - lib/inferno/utils/markdown_formatter.rb