mesa_test 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c96fa1d7f14f26d3939b4181beaaf90794b6961c1f950929d082efeded141d0
-  data.tar.gz: d62090f1466965437691588a438ad9f93d5efb8d651e533dfb964a8becca6c57
+  metadata.gz: e39eda31af33458a33b066006203290ebe1c7b51daf79b8347bda4da7a28b5c9
+  data.tar.gz: 2a5d0c0ccb199c0be121b0614e5ea28252d5802affa1d26def601433df125fd9
 SHA512:
-  metadata.gz: 1a5be579dbd47563dfb8e2b094ac1c25945592d677aca369c9760cad588e60b8501061a4b498f5c4c67667c2c459db50858ee41af153e3ff75cfa61eff83e4df
-  data.tar.gz: 68126e62c0d7edc66e8f28ecd0a39e85698f448be00f024ba10e7e68757581878fd83a131049ce7815b0046cd2b5c8e14aa78aea2f94d6c4caa76e51afa28215
+  metadata.gz: 140d12aeeb0211108a56c52f537811ac46cba6c3792599ab76a33a536d575951b1d4d1b2b86d9ae37eb2055dc2eae3123ece53b4bd176f76f8176fa661a32b60
+  data.tar.gz: bd83ecabec1798df5e2142d8e5381f8d0fc559671e9b84913362e66b70b2b81b82ce6a97f27ca5371444aa0643fa96d67ac8ac7262dc40dd0fda1236986a8d24

data/lib/mesa_test.rb

@@ -252,6 +252,7 @@ e-mail and password will be stored in plain text.'
       steps: test_case.steps,
       retries: test_case.retries,
       backups: test_case.backups,
+      diff: test_case.diff,
       summary_text: test_case.summary_text
     }
 
@@ -306,6 +307,7 @@ e-mail and password will be stored in plain text.'
               steps: test_case.steps,
               retries: test_case.retries,
               backups: test_case.backups,
+              diff: test_case.diff,
               summary_text: test_case.summary_text
             },
             extra: { test_case: test_name, mod: mod }
@@ -895,7 +897,7 @@ class MesaTestCase
               :failure_msg, :success_msg, :photo, :runtime_seconds,
               :test_omp_num_threads, :mesa_version, :shell, :mod, :retries,
               :backups, :steps, :runtime_minutes, :summary_text, :compiler,
-              :compiler_version
+              :compiler_version, :diff
   attr_accessor :data_names, :data_types, :failure_type, :success_type,
                 :outcome
 
@@ -921,7 +923,13 @@ class MesaTestCase
     @retries = 0
     @backups = 0
     @steps = 0
-    @summary_text = ''
+    # 2 (default) means uknown. Updated by running or loading data.
+    # 1 means did diffs (not update_checksums; like each_test_run_and_diff)
+    # 0 means no diffs (update_checksums; like each_test_run)
+    @diff = 2
+
+    # note: this gets overridden for new runs, so this is probably irrelevant
+    @summary_text = nil
 
     # this overrides the submitters choice if it is non-nil
     @compiler = mesa.using_sdk ? 'SDK' : nil
@@ -935,6 +943,8 @@ class MesaTestCase
     @mod = mod
     @failure_msg = {
       run_test_string: "#{test_name} run failed: does not match test string",
+      final_model: "#{test_name} run failed: final model #{final_model} not " \
+        'made.',
       run_checksum: "#{test_name} run failed: checksum for #{final_model} " \
         'does not match after ./rn',
       run_diff: "#{test_name} run failed: diff #{final_model} " \
@@ -1079,6 +1089,7 @@ class MesaTestCase
       'retries' => retries,
       'backups' => backups,
       'steps' => steps,
+      'diff' => diff,
       'summary_text' => summary_text
     }
     if compiler == 'SDK'
@@ -1110,8 +1121,10 @@ class MesaTestCase
     @retries = data['retries'] || @retries
     @backups = data['backups'] || @backups
     @steps = data['steps'] || @steps
+    @diff = data['diff'] || @diff
     @summary_text = data['summary_text'] || @summary_text
     @compiler = data['compiler'] || @compiler
+
     @compiler_version = data['compiler_version'] || @compiler_version
 
     # convert select data to symbols since that is how they are used
@@ -1250,6 +1263,9 @@ class MesaTestCase
     # display runtime message
     puts IO.readlines('out.txt').select { |line| line.scan(/runtime/i) }[-1]
 
+    # there's supposed to be a final model; check that it exists first
+    return fail_test(:final_model) unless File.exist?(final_model)
+
     # update checksums
     #
     # if this is true, behave like each_test_run.  update the checksum
@@ -1258,6 +1274,7 @@ class MesaTestCase
     # if this is false, behave like each_test_run_and_diff.  assume
     # the checksum is up-to-date and check it matches after rn and re.
     if @mesa.update_checksums
+      @diff = 0  # this means no diffs run
       puts "md5sum \"#{final_model}\" > checks.md5"
       bash_execute("md5sum \"#{final_model}\" > checks.md5")
       FileUtils.cp final_model, 'final_check.mod'
@@ -1269,6 +1286,7 @@ class MesaTestCase
     end
 
     # check that final model matches
+    @diff = 1  # this means diffs were run
     puts './ck >& final_check_diff.txt'
     return fail_test(:run_checksum) unless
       bash_execute('./ck >& final_check_diff.txt')
@@ -1284,7 +1302,8 @@ class MesaTestCase
 
     # check that photo file actually exists
     unless File.exist?(File.join('photos', photo)) ||
-           File.exist?(File.join('photos1', photo))
+           File.exist?(File.join('photos1', photo)) ||
+           File.exist?(File.join('photos', "b_#{photo}"))
       return fail_test(:photo_file)
     end
 
@@ -1408,6 +1427,17 @@ class MesaTestCase
   end
 
   def get_summary_text
+    # original plan was to include diff data in summary text... now it's just
+    # part of the test_instance object and is submitted as an integer
+    # res = case diff
+    #       when 0
+    #         "No Diff\n"
+    #       when 1
+    #         "Diff\n"
+    #       else
+    #         "Ambiguous Diff\n"
+    #       end
+    # res +
     IO.readlines(out_file).select do |line|
       line =~ /^\s*runtime/ 
     end.join

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json