mesa_test 1.1.6 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a113597b8d49b277030dabfb72f46b42bf4c6d33993d86fd3bd98c513bbf44
-  data.tar.gz: 355642660dddb5a4b87934c0f8fcb9c43a9fa4f900d8d809f62cda3cafcb8d89
+  metadata.gz: b1bc3ecd06c1d2cc95d041b7171dc9c6cda0ccb6536beec798f3969b8f8aa87d
+  data.tar.gz: 4c0109db46572db7e9dc3d2f2aa0dda259b21ba5049448874d5a0d1ec7a85d6a
 SHA512:
-  metadata.gz: 6db7a9183094ce00ca25adc3c51a02570a4d381432be02ee61ebf48d774b4e90904f61171e8530f8db6f2b6dc819bc78ff644ec8e85ff4b0da5d45ea70bf9f37
-  data.tar.gz: a42908b873207b17ed8195f26c4bde8dd479e2c69dc49e3f2a406e4190109f95522aeb466741b2f18fd1d9966356bf22b7539ec2630af37322b7544bc3ac4cfc
+  metadata.gz: f28bd6704f63e5e37c9fc1bf253458012587febf4c11278e143ec2edf10d826d4c37a183cf0a870c6e92419c2145509407cc3cee37136ee43b02035d7f6254d0
+  data.tar.gz: 92055286204281167d4655278e9b36c35c4bc1c4de04fb8e41180d19cbc21d71f4b50d5f2489628068ffc79bf1fb0794e164b4f6dcdadac2ad46e31cf34c98d8

data/bin/mesa_test

@@ -57,29 +57,31 @@ class MesaTest < Thor
       mod: options[:module].downcase.to_sym,
       github_protocol: s.github_protocol
     )
-    if test_case_name
-      # only testing one test case
-      t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
-                                     mod: options[:module].downcase.to_sym)
-
-      # run test
-      t.do_one
-
-      # bail out if not submitting
-      return unless options[:submit]
-
-      # submit results
-      shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      s.submit_instance(m, t, force_logs: options['force-logs'])
-    else
-      # run all tests
-      m.each_test_run(mod: options[:module].downcase.to_sym)
-
-      # bail out if not submitting
-      return unless options[:submit]
-
-      shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      s.submit_commit(m, force_logs: options['force-logs'])
+    m.with_mesa_dir do
+      if test_case_name
+        # only testing one test case
+        t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
+                                       mod: options[:module].downcase.to_sym)
+  
+        # run test
+        t.do_one
+  
+        # bail out if not submitting
+        return unless options[:submit]
+  
+        # submit results
+        shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
+        s.submit_instance(m, t, force_logs: options['force-logs'])
+      else
+        # run all tests
+        m.each_test_run(mod: options[:module].downcase.to_sym)
+  
+        # bail out if not submitting
+        return unless options[:submit]
+  
+        shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
+        s.submit_commit(m, force_logs: options['force-logs'])
+      end
     end
     shell.say "Done.\n", :green
   end
@@ -123,31 +125,32 @@ class MesaTest < Thor
 
     # default value for now; might change to false if we have a bad
     # installation or if a test case is specified
-
-    if test_case_name
-      # just submitting one test case.
-      # this is not an empty submission since there is one test case (the
-      # +empty+ option is ignored in this case)
-
-      t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
-                                     mod: options[:module].downcase.to_sym)
-      # submit results
-      shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
-      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
-      # no tests (empty)
-      begin
-        m.check_installation
-      rescue MesaDirError
-        shell.say %q{This MESA installation doesn't seem to be compiled } \
-          'properly. Attempting to submit a compilation failure to '\
-          'MESATestHub.', :red
-        empty = true
-      ensure
-        # submit all tests
-        s.submit_commit(m, empty: empty, force_logs: options['force-logs'])
+    m.with_mesa_dir do
+      if test_case_name
+        # just submitting one test case.
+        # this is not an empty submission since there is one test case (the
+        # +empty+ option is ignored in this case)
+  
+        t = create_and_check_test_case(mesa: m, test_case_name: test_case_name,
+                                       mod: options[:module].downcase.to_sym)
+        # submit results
+        shell.say 'Submitting results to ' + s.base_uri + '... ', :blue
+        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
+        # no tests (empty)
+        begin
+          m.check_installation
+        rescue MesaDirError
+          shell.say %q{This MESA installation doesn't seem to be compiled } \
+            'properly. Attempting to submit a compilation failure to '\
+            'MESATestHub.', :red
+          empty = true
+        ensure
+          # submit all tests
+          s.submit_commit(m, empty: empty, force_logs: options['force-logs'])
+        end
       end
     end
   end
@@ -298,7 +301,7 @@ class MesaTest < Thor
 
       # run all tests. Don't be fooled, whether or not a diff happens is set
       # by the diff attribute of the mesa object, set above.
-      m.each_test_run(mod: options[:module].downcase.to_sym)
+      m.with_mesa_dir { m.each_test_run(mod: options[:module].downcase.to_sym) }
     ensure
       # submit all commit and test data
       successfully_submitted = false

data/lib/mesa_test.rb

@@ -484,8 +484,9 @@ e-mail and password will be stored in plain text.'
 
   # send build log to the logs server
   def submit_test_log(test_case, skip_passing: true)
-    # skip submission if mesa was never installed or if the test passed
-    if !test_case.mesa.installed? || (test_case.passed? && skip_passing)
+    # 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
 
@@ -608,11 +609,11 @@ class Mesa
       end
     end
 
-    update_mirror
-
     # ensure "work" directory is removed from worktree
     remove
 
+    update_mirror
+
     # create "work" directory with proper commit
     shell.say "\nSetting up worktree repo...", :blue
     FileUtils.mkdir_p mesa_dir
@@ -812,16 +813,6 @@ class Mesa
     File.exist? File.join(mesa_dir, 'testhub.yml')
   end
 
-  private
-
-  # verify that mesa_dir is valid by checking for existence of test_suite
-  # directory for each module (somewhat arbitrary)
-  def check_mesa_dir
-    MesaTestCase.modules.inject(true) do |res, mod|
-      res && dir_or_symlink_exists?(test_suite_dir(mod: mod))
-    end
-  end
-
   # change MESA_DIR for the execution of the block and then revert to the
   # original value
   def with_mesa_dir
@@ -829,7 +820,7 @@ class Mesa
     orig_mesa_dir = ENV['MESA_DIR']
     ENV['MESA_DIR'] = mesa_dir
     shell.say "Temporarily changed MESA_DIR to #{ENV['MESA_DIR']}.", :blue
-
+  
     # do the stuff
     begin
       yield
@@ -840,6 +831,16 @@ class Mesa
     end
   end
 
+  private
+
+  # verify that mesa_dir is valid by checking for existence of test_suite
+  # directory for each module (somewhat arbitrary)
+  def check_mesa_dir
+    MesaTestCase.modules.inject(true) do |res, mod|
+      res && dir_or_symlink_exists?(test_suite_dir(mod: mod))
+    end
+  end
+
   def all_names_ordered(mod: :all)
     load_test_source_data unless @names_to_numbers
     if mod == :all
@@ -978,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
@@ -988,14 +993,18 @@ 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.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
   # if we can load the results hash, though
   def passed?

metadata

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