mesa_test 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4175b143755a80f3ce582986323c664a17fe8f0db913eb9473316cb764f6a21
-  data.tar.gz: a07e0f269ab0682b11672a5df6bb9daf1156ae091a413a35134692319cb21257
+  metadata.gz: 83dd219ff4bd0ab2775b8aa9f0499be901611fbfac3ae6bf24f8a3641d86d1c8
+  data.tar.gz: 6cabcfdaf08dade75fe045b4e771107b9b2a70df57027cb5a15453e4ef73c5e0
 SHA512:
-  metadata.gz: e58bcd0dc8cbe7b6090b3ebef9dff36b0315eefa783c026b246342c743051fdf5d476e553126fac7a7a47232039fc94ead404bf395ba92f983fc87af7d62f5c7
-  data.tar.gz: 61970b7c59673002ed7d9d00b9cc4c47f499210e3983e0047a0155d586b3d103dc199f81bdadf3529df4a2d4404aa16644adced4c0ee18f222397e4edb9facb6
+  metadata.gz: d409f946cb32abb2f1c27d8e3516052f2bc1fd706032bef9dc0a0876c84cae86980a5b7c060505708afd3ad20065c675681d6ec05c53305c6cb26d97feb6e3ba
+  data.tar.gz: e5d46b80e6942a075c2d3c1dd7c55d5ad519309d9fb307f8fc9ba960c301a30a0497c5362d504a136f7d72cd3d16068637859d37efab015bf0fa887f72e608e8

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
@@ -1079,6 +1087,7 @@ class MesaTestCase
       'retries' => retries,
       'backups' => backups,
       'steps' => steps,
+      'diff' => diff,
       'summary_text' => summary_text
     }
     if compiler == 'SDK'
@@ -1110,8 +1119,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
@@ -1258,6 +1269,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 +1281,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 +1297,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 +1422,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.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json