mesa_test 1.1.4 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ebdd3dbd2229928d24bc1a5c56ab18fa34291181f804c5371df8572eff546c5
-  data.tar.gz: b9ce87dcff915345719a8992e5db358d431ddd8d9221bb3ef813c7b414af0725
+  metadata.gz: cd52a22e9772094f32247bd8785a508f384ceaec1f32d7e6541920d92e730227
+  data.tar.gz: 20b34824551a54e1fd529867d2451972168d663d0f7f799fa19c3e9293477360
 SHA512:
-  metadata.gz: faf57662b9d766780f26b5cc20e46f603b7de8683b9b4cb124911c356a3ab52eccabe29066b4de347822678b10777a3c3a940c17fcab20972366ec944e84c92a
-  data.tar.gz: b5925453408e4ea1aca27092b82a09345e096e4e88140eb6be67d6c2ca64f88d9527b27378edd9afe93d4dd3bb89acacba8416ebf6188ecdb6810def9316d618
+  metadata.gz: 2ee0df9acc559f188b5dcb1dbab9124cc3cb379ad213aff5910943df367f753e8594d4b2bfee597a2c129f46523434a9e7c931707073c340b9db3ccd26fcc9c7
+  data.tar.gz: d1cfbfe89e93881108f0fd5bbe7f0676e2812dbe8310549de9ca971ee044932904ad5062331019bef828d73322ac1aada2c439f0f4533ce2adee7dc51fe022d9

data/bin/mesa_test

@@ -4,7 +4,7 @@
 # rather than system version and run out of local lib, not installed
 # if :staging, submit to beta version and run out of local lib, not installed
 # anything else: trust rubygems to get lib and submit to real deal testhub
-MODE = :development
+MODE = :production
 
 case MODE
 when :staging, :development
@@ -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)
@@ -974,6 +979,10 @@ class MesaTestCase
     File.join(test_suite_dir, test_name)
   end
 
+  def testhub_file
+    File.join(test_case_dir, 'testhub.yml')
+  end
+
   # just punt to +each_test_run+ in the test_suite directory. It's your problem
   # now, sucker!
   def do_one
@@ -984,12 +993,16 @@ class MesaTestCase
   end
 
   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.4
+  version: 1.1.8
 platform: ruby
 authors:
 - William Wolf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json