mesa_test 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6255c7b67b9190d0c23406f6222f5dd1c754767
-  data.tar.gz: 5b53a5a876138cd19f42300b98d2e01826ca85c0
+  metadata.gz: e9fed2c720b2a988af51cf039b7fb00c7c2b1351
+  data.tar.gz: ee251c506f1f203d4899fa799519921312e4f107
 SHA512:
-  metadata.gz: 3c1e1949452d9e28a0bbaa735d937e50659266ee83ea67d01bfce7b959fcc10f30d255873db2ea625d24c05a84f784e8157b1cb7b56a594459e505f308e23bf0
-  data.tar.gz: 3215aac2ee3c010de8c36daec52757a7a2c96af6b8b0c48212ac04b99af58e1279d260574d2aa5a965f6c81acc5884d012ac3ff12114c325f07073ecc0080775
+  metadata.gz: e38d7647e692dba6ffdce3e2fa971bd47b4d4549a52e44805d34e42220bec9696973f786b7c162873fef7c9c63fc77375b790585cd967b233bd5d77f571a1fc0
+  data.tar.gz: 94168a931b36aea7d2315914d625f2fd51da500ce4196066213488628e0efafe393e45e222ca2da2aaf38c716b9c5836a05c8e4af7d84a833cd10cc89344d15f

data/bin/mesa_test

@@ -27,6 +27,10 @@ class MesaTest < Thor
 
   #{MesaTestCase.modules.map { |mod| '    ' + mod.to_s }.join(', ')}
 
+  With --diff option, assume the checksums are up-to-date (behave like
+  each_test_run_and_diff), on by default.  To update checksums after ./rn
+  (behave like each_test_run), use --no-diff.
+
   With --force option, skip confirmation of computer details, assuming values
   in ~/.mesa_test.yml are correct.
 
@@ -39,6 +43,7 @@ class MesaTest < Thor
   With --submit option, upload results to MESATestHub. By default, this is on.
   To run without submission, use --no-submit.
   LONGDESC
+  option :diff, type: :boolean, default: true
   option :force, type: :boolean, aliases: '-f'
   option :log, type: :boolean, default: true
   option :module, type: :string, default: :all
@@ -62,6 +67,9 @@ class MesaTest < Thor
       m.installed?
     m.load_test_source_data
 
+    # choose whether to update checksums
+    m.update_checksums = !options[:diff]
+
     # make sure the test case is valid
     t = m.find_test_case(test_case_name: test_case_name,
                          mod: options[:module].downcase.to_sym)
@@ -97,6 +105,10 @@ class MesaTest < Thor
   report results to MesaTestHub. Specifically, runs and checks all tests
   detailed in MESA_DIR/star/test_suite/do1_test_source.
 
+  With --diff option, assume the checksums are up-to-date (behave like
+  each_test_run_and_diff), on by default.  To update checksums after ./rn
+  (behave like each_test_run), use --no-diff.
+
   With --force option, skip confirmation of computer details, assuming values
   in ~/.mesa_test.yml are correct. Only relevant if --submit option is on
   (by default it is).
@@ -107,6 +119,7 @@ class MesaTest < Thor
   With --submit option, upload results to MESATestHub. By default, this is on.
   To run without submission, use --no-submit.
   LONGDESC
+  option :diff, type: :boolean, default: true
   option :force, type: :boolean, aliases: '-f'
   option :log, type: :boolean, default: true
   option :submit, type: :boolean, default: true
@@ -132,6 +145,7 @@ class MesaTest < Thor
     m.load_test_source_data
 
     # run all tests
+    m.update_checksums = !options[:diff]
     m.each_test_run_and_diff(log_results: options[:log])
 
     # submit all tests

data/lib/mesa_test.rb

@@ -27,56 +27,56 @@ are all required. All other data are useful, but optional. Any data
 transferred to MESATestHub will be encrypted via HTTPS, but be warned that your
 e-mail and password will be stored in plain text.'
       # Get computer name
-      response = shell.ask("What is the name of this computer (required)? "+
-        "(#{s.computer_name}):", color = :blue)
+      response = shell.ask('What is the name of this computer (required)? ' \
+        "(#{s.computer_name}):", :blue)
       s.computer_name = response unless response.empty?
 
       # Get user name
-      response = shell.ask "What is the name of the operator of this " +
-        "computer? (#{s.user_name}):", color = :blue
+      response = shell.ask 'What is the name of the operator of this ' \
+        "computer? (#{s.user_name}):", :blue
       s.user_name = response unless response.empty?
 
       # Get user e-mail
-      response = shell.ask "What is the email you can be reached " +
-        "at (required)? (#{s.email}):", color = :blue
+      response = shell.ask 'What is the email you can be reached ' \
+        "at (required)? (#{s.email}):", :blue
       s.email = response unless response.empty?
 
       # Get user password
-      response = shell.ask "What is the password associated with the email " +
-        "#{s.email} (required)? (#{s.password})", color = :blue
+      response = shell.ask 'What is the password associated with the email ' \
+        "#{s.email} (required)? (#{s.password})", :blue
       s.password = response unless response.empty?
 
       # Get platform information
-      response = shell.ask "What is the platform of this computer (eg. " +
-        "macOS, Ubuntu)? (#{s.platform}):", color = :blue
+      response = shell.ask 'What is the platform of this computer (eg. ' \
+        "macOS, Ubuntu)? (#{s.platform}):", :blue
       s.platform = response unless response.empty?
-      response = shell.ask "What is the version of the platform (eg. 10.13, "+
-        "16.04)? (#{s.platform_version}):", color = :blue
+      response = shell.ask 'What is the version of the platform (eg. 10.13, ' \
+        "16.04)? (#{s.platform_version}):", :blue
       s.platform_version = response unless response.empty?
 
       # Get processor information
-      response = shell.ask "What type of processor does this computer have " +
-        "(eg. 3.1 GHz Intel i7)? (#{s.processor}):", color = :blue
+      response = shell.ask 'What type of processor does this computer have ' \
+        "(eg. 3.1 GHz Intel i7)? (#{s.processor}):", :blue
       s.processor = response unless response.empty?
 
       # Get ram information
-      response = shell.ask "How much RAM (in integer GB) does this computer " +
-        "have (eg. 8)? (#{s.ram_gb}) ", color = :blue
+      response = shell.ask 'How much RAM (in integer GB) does this computer ' \
+        "have (eg. 8)? (#{s.ram_gb}) ", :blue
       s.ram_gb = response.to_i unless response.empty?
 
       # Get compiler information
-      response = shell.ask "Which compiler are you using? (#{s.compiler}):", 
-        color = :blue, limited_to: ['', 'SDK', 'gfortran', 'ifort']
-      s.compiler = response unless response.empty? 
+      response = shell.ask "Which compiler are you using? (#{s.compiler}):",
+                           :blue, limited_to: ['', 'SDK', 'gfortran', 'ifort']
+      s.compiler = response unless response.empty?
 
       # Get compiler version
-      response = shell.ask "What version of the compiler (eg. 20170921 or " +
-        "7.2.0)? (#{s.compiler_version}): ", color = :blue
+      response = shell.ask 'What version of the compiler (eg. 20170921 or ' \
+        "7.2.0)? (#{s.compiler_version}): ", :blue
       s.compiler_version = response unless response.empty?
 
       # Confirm save location
-      response = shell.ask "This will be saved in #{s.config_file}. Press " +
-        "enter to accept or enter a new location:", color = :blue, path: true
+      response = shell.ask "This will be saved in #{s.config_file}. Press " \
+        'enter to accept or enter a new location:', :blue, path: true
       s.config_file = response unless response.empty?
     end
 
@@ -166,10 +166,8 @@ e-mail and password will be stored in plain text.'
     puts "Config location         #{config_file}"
     puts '-------------------------------------------------------'
     puts ''
-    shell = Thor.new
     response = shell.ask 'Is this correct? (y/Y = Yes, anything else = No):'
-    return true if response.strip.casecmp 'y'
-    false
+    response.strip.casecmp('y') == 0
   end
 
   # For one "computer" on the web server, and for [subjective] consistency
@@ -329,6 +327,7 @@ end
 
 class Mesa
   attr_reader :mesa_dir, :test_data, :test_names, :test_cases, :shell
+  attr_accessor :update_checksums
 
   def self.download(version_number: nil, new_mesa_dir: nil)
     new_mesa_dir ||= File.join(ENV['HOME'], 'mesa-test-r' + version_number.to_s)
@@ -343,6 +342,7 @@ class Mesa
 
   def initialize(mesa_dir: ENV['MESA_DIR'])
     @mesa_dir = mesa_dir
+    @update_checksums = false
 
     # these get populated by calling #load_test_data
     @test_data = {}
@@ -909,20 +909,23 @@ class MesaTestCase
     # no final model to check, and we already found the test string, so pass
     return succeed(:run_test_string) unless final_model
 
-    # additional checks for final model, if it is specified
-    # update checks after new run (Bill W. doesn't know what this does)
-    # (is this supposed to mark things as passed? The original function
-    # just has a standard "return" statement, which I interpret as passing)
-    if ENV.include? 'UPDATE_CHECKS'
+    # display runtime message
+    puts IO.readlines('out.txt').select { |line| line.scan(/runtime/i) }[-1]
+
+    # update checksums
+    #
+    # if this is true, behave like each_test_run.  update the checksum
+    # after rn and then check it matches after re
+    #
+    # 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
       system("md5sum \"#{final_model}\" > checks.md5")
       puts "md5sum \"#{final_model}\" > checks.md5"
-      FileUtils.cp final_model 'final_check.mod'
+      FileUtils.cp final_model, 'final_check.mod'
       return true
     end
 
-    # display runtime message
-    puts IO.readlines('out.txt').select { |line| line.scan(/runtime/i) }[-1]
-
     # check that final model matches
     puts './ck >& final_check_diff.txt'
     return fail_test(:run_checksum) unless

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - William Wolf