mesa_test 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6aece52d2c391d00f2fc190fc466bbcd65f892e0779857d191b60705aa16aa
-  data.tar.gz: 5783cb8940b3ad6d7e8373fec41325c5ffc60f7ba63c912c04c9da78fbf3173e
+  metadata.gz: efc30aaa2527a9b7d5b1432f73086b20e5b2eeec104f818c1fc8fdb7c9b69e0f
+  data.tar.gz: 606ed99026dfbcefbdca50f6e4e3f53049f59594e2e21ee092b8ff226312148f
 SHA512:
-  metadata.gz: 2fc8fe1a184c7ac9b9df350236288445f01e5cccbb8ab4c2d684911e268730f65df24479e1afa62bf03bdabefa9a0e7d82cdbfbda44528e8fb38764071f0bc67
-  data.tar.gz: 4001cf3f05fd3076f27fae7082aff30f55b1257ee466c38e1a8dee0cc9529f7748357eea6106f6c8adcadaf6f839923f006a73365a198b45d939a425a30531a7
+  metadata.gz: fd3560820fdd7b33e16cde218d61cdf964f851f99f08e1ef7b590cd659314fd5c5cf6cba739095318b9214e8110b098bd4dfc569388cb7c93b39f82bbc2646a5
+  data.tar.gz: 2a4f7d381e7ac5e155bf7000347443fafd04fda8363f12debeea1843561b5b832e9f3268d3670e267f41ec241b8f4cb3d775158d9cf00e5a3eddbd6f86caad23

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

@@ -212,7 +212,7 @@ e-mail and password will be stored in plain text.'
   end
 
   def load_computer_data
-    data_hash = YAML.safe_load(File.read(config_file), [Symbol])
+    data_hash = YAML.load(File.read(config_file))
     @computer_name = data_hash['computer_name']
     @email = data_hash['email']
     @password = data_hash['password']
@@ -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,12 @@ e-mail and password will be stored in plain text.'
   end
 
   # send build log to the logs server
-  def submit_test_log(test_case)
-    # skip submission if mesa was never installed or if the test passed
-    return true if !test_case.mesa.installed? || test_case.passed?
+  def submit_test_log(test_case, skip_passing: true)
+    # skip submission if mesa was never installed, test was never run, or if
+    # the test passed
+    if !test_case.mesa.installed? || !test_case.ran? || (test_case.passed? && skip_passing)
+      return true
+    end
 
     # don't even try unless we have a logs token set
     unless logs_token
@@ -622,7 +627,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)
@@ -985,11 +990,16 @@ class MesaTestCase
 
   def results_hash
     testhub_file = File.join(test_case_dir, 'testhub.yml')
-    unless File.exist?(testhub_file)
+    unless ran?
       raise TestCaseDirError.new('No results found for test case '\
                                  "#{test_name}.")
     end
-    YAML.safe_load(File.read(testhub_file), [Symbol])
+    YAML.load(File.read(testhub_file))
+  end
+
+  # rough proxy for whether or not the test has even been run
+  def ran?
+    File.exist?(testhub_file)
   end
 
   # whether or not a test case has passed; only has meaning

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.7
 platform: ruby
 authors:
 - William Wolf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Command line tool for running and reporting the MESA test suites.