mesa_test 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a3b5fcc09a02b4c410c9b0ab2aac3d6dfa3dfcf6f5900cb8a38ef0331c046d
-  data.tar.gz: 916e67cc83f406d3445ab7929550040d1523ec5bde28912eff7ce21cfff3c99b
+  metadata.gz: 62a113597b8d49b277030dabfb72f46b42bf4c6d33993d86fd3bd98c513bbf44
+  data.tar.gz: 355642660dddb5a4b87934c0f8fcb9c43a9fa4f900d8d809f62cda3cafcb8d89
 SHA512:
-  metadata.gz: 4a515ba0b01e33f620859ed424c52d9100dfacbfb2879a2d4501727754dc632fc4aafc949cdffc8e7232d63ab8b6efa780ac38605ffeb2b9712b2fb15dfa8dc7
-  data.tar.gz: e3e2bb6229c70234288febc0cdafd32d7f0f5ace512afb68b21a3afccfb1091e6954a5101797e610c92341684337c48a8dd667754afbcdee91162dbdd9dc318c
+  metadata.gz: 6db7a9183094ce00ca25adc3c51a02570a4d381432be02ee61ebf48d774b4e90904f61171e8530f8db6f2b6dc819bc78ff644ec8e85ff4b0da5d45ea70bf9f37
+  data.tar.gz: a42908b873207b17ed8195f26c4bde8dd479e2c69dc49e3f2a406e4190109f95522aeb466741b2f18fd1d9966356bf22b7539ec2630af37322b7544bc3ac4cfc

data/bin/mesa_test

@@ -36,6 +36,8 @@ class MesaTest < Thor
                        '~/.mesa_test.yml are correct rather than checking ' \
                        'with user.',
                  type: :boolean, default: true, aliases: '-f'
+  option 'force-logs', desc: 'Submit logs for test case(s), even if they pass',
+                       type: :boolean, default: false
   option :submit, desc: 'Submit results (if any) to MesaTestHub.',
                   type: :boolean, default: true
   option :module, desc: 'Which module to test and/or submit, if applicable.',
@@ -68,7 +70,7 @@ class MesaTest < Thor
 
       # submit results
       shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      s.submit_instance(m, t)
+      s.submit_instance(m, t, force_logs: options['force-logs'])
     else
       # run all tests
       m.each_test_run(mod: options[:module].downcase.to_sym)
@@ -77,7 +79,7 @@ class MesaTest < Thor
       return unless options[:submit]
 
       shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      s.submit_commit(m)
+      s.submit_commit(m, force_logs: options['force-logs'])
     end
     shell.say "Done.\n", :green
   end
@@ -98,6 +100,8 @@ class MesaTest < Thor
                        '~/.mesa_test.yml are correct rather than checking ' \
                        'with user.',
                  type: :boolean, default: true, aliases: '-f'
+  option 'force-logs', desc: 'Submit logs for test case(s), even if they pass',
+                       type: :boolean, default: false
   option :module, desc: 'Which module to test and/or submit, if applicable.',
                   type: :string, default: 'all', aliases: '-m'
   option :empty, desc: 'Whether any test cases will be submitted. Useful for '\
@@ -129,7 +133,7 @@ class MesaTest < Thor
                                      mod: options[:module].downcase.to_sym)
       # submit results
       shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      s.submit_instance(m, t)
+      s.submit_instance(m, t, force_logs: options['force-logs'])
       shell.say "Done.\n", :green
     else
       # submitting compilation information and either all tests (entire) or
@@ -143,7 +147,7 @@ class MesaTest < Thor
         empty = true
       ensure
         # submit all tests
-        s.submit_commit(m, empty: empty)
+        s.submit_commit(m, empty: empty, force_logs: options['force-logs'])
       end
     end
   end
@@ -298,7 +302,10 @@ class MesaTest < Thor
     ensure
       # submit all commit and test data
       successfully_submitted = false
-      successfully_submitted = s.submit_commit(m) if options[:submit]
+      if options[:submit]
+        successfully_submitted = s.submit_commit(
+          m, force_logs: options['force-logs'])
+      end
 
       # if requested, installation and submission are successful, destroy the
       # directory

data/lib/mesa_test.rb

@@ -334,7 +334,7 @@ e-mail and password will be stored in plain text.'
 
   # submit entire commit's worth of test cases, OR submit compilation status
   # and NO test cases
-  def submit_commit(mesa, empty: false)
+  def submit_commit(mesa, empty: false, force_logs: false)
     unless mesa.install_attempted?
       raise MesaDirError, 'No testhub.yml file found in installation; '\
                           'must attempt to install before subitting.'
@@ -386,8 +386,8 @@ e-mail and password will be stored in plain text.'
           test_case_hash.each do |tc_name, test_case|
             # get at each individual test case, see if it failed, and if it
             # did, submit its log files
-            unless test_case.passed?
-              res &&= submit_test_log(test_case)
+            if !test_case.passed? || force_logs
+              res &&= submit_test_log(test_case, skip_passing: !force_logs)
             end
           end
         end
@@ -401,7 +401,7 @@ e-mail and password will be stored in plain text.'
 
   # submit results for a single test case instance. Does *not* report overall
   # compilation status to testhub. Use an empty commit submission for that
-  def submit_instance(mesa, test_case)
+  def submit_instance(mesa, test_case, force_logs: false)
     unless mesa.install_attempted?
       raise MesaDirError, 'No testhub.yml file found in installation; '\
                           'must attempt to install before subitting.'
@@ -436,7 +436,9 @@ e-mail and password will be stored in plain text.'
       shell.say "\nSuccessfully submitted instance of #{test_case.test_name} "\
                 "for commit #{mesa.sha}.", :green
       # submit logs if test failed
-      return submit_test_log(test_case) unless test_case.passed?
+      if !test_case.passed? || force_logs
+        return submit_test_log(test_case, skip_passing: !force_logs)
+      end
       true
     end
   end
@@ -481,9 +483,11 @@ e-mail and password will be stored in plain text.'
   end
 
   # send build log to the logs server
-  def submit_test_log(test_case)
+  def submit_test_log(test_case, skip_passing: true)
     # skip submission if mesa was never installed or if the test passed
-    return true if !test_case.mesa.installed? || test_case.passed?
+    if !test_case.mesa.installed? || (test_case.passed? && skip_passing)
+      return true
+    end
 
     # don't even try unless we have a logs token set
     unless logs_token
@@ -622,7 +626,7 @@ class Mesa
 
   def update_mirror
     shell.say "\nFetching MESA history...", :blue
-    command = "git -C #{mirror_dir} fetch origin"
+    command = "git -C #{mirror_dir} fetch origin --prune"
     shell.say command
     # fail loudly
     return if bash_execute(command)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - William Wolf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-21 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json