mesa_test 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c06f0e253f2ec4ad279aa734ef85a8427b71eee
-  data.tar.gz: 36aff1d20856a1945f3224ebf69170f670ab86c8
+  metadata.gz: 52edc717f3e8c1322b3448c01cb323857d86a1a2
+  data.tar.gz: 7287c330978661cd7a4a265c24f57cb09807a340
 SHA512:
-  metadata.gz: 66722dfff82bde4c8e5b39ae71ee235f7abffb01b8bf0d1aff3fc4bd90db40407cc21ef10c18bc7785927b178aa17d451671d8ada974f055581e0856ed101da1
-  data.tar.gz: c77368f2ce742fa8eb81e51d5fc59476c5a26ff8e8ef5fccb4da6aa37d0e2dd274e1b494036d9636885da3b7b744d5114cfaf2a386ec2c8daf186d517771c9db
+  metadata.gz: 9424e51b29121151ad2abc2b4d8ea5969263e0785a68111755b4b9318c722fb610f790d94a948b565c528d9b12fb76bc3c904a919a3dbaa5244207d8742a7146
+  data.tar.gz: aa31face553ef21a787e8a0540ac67a965e670f1009093390b5f02755c080b98bc6f56eda7b75c745ac0f6476306b9975238ceda3dbc3421f35a78e1593ffbc2

data/lib/mesa_test.rb

@@ -92,6 +92,7 @@ e-mail and password will be stored in plain text.'
   def self.new_from_config(
     config_file: File.join(ENV['HOME'], '.mesa_test.yml'), force_setup: false,
     base_uri: 'https://mesa-test-hub.herokuapp.com'
+    # base_uri: 'http://localhost:3000'
   )
     new_submitter = new(config_file: config_file, base_uri: base_uri)
     if force_setup
@@ -195,9 +196,9 @@ e-mail and password will be stored in plain text.'
       'ram_gb' => ram_gb,
       'platform_version' => platform_version,
       'compiler' => compiler,
-      'compiler_version' => compiler_version      
+      'compiler_version' => compiler_version
     }
-    File.open(config_file, 'w') { |f| f.write(YAML.dump(data_hash))}
+    File.open(config_file, 'w') { |f| f.write(YAML.dump(data_hash)) }
   end
 
   def load_computer_data
@@ -218,6 +219,7 @@ e-mail and password will be stored in plain text.'
   def submit_params(test_case)
     res = {
       test_case: test_case.test_name,
+      mod: test_case.mod,
       computer: computer_name,
       email: email,
       password: password,
@@ -232,19 +234,19 @@ e-mail and password will be stored in plain text.'
       failure_type: test_case.failure_type
     }
 
-    # enter in test-specific data
-    test_case.data_names.each do |data_name|
-      unless test_case.data[data_name].nil?
-        res[data_name] = test_case.data[data_name]
-      end
-    end
+    # enter in test-specific data, DISABLED FOR NOW
+    # test_case.data_names.each do |data_name|
+    #   unless test_case.data[data_name].nil?
+    #     res[data_name] = test_case.data[data_name]
+    #   end
+    # end
     res
   end
 
   def confirm_computer
     uri = URI.parse(base_uri + '/check_computer.json')
     https = Net::HTTP.new(uri.hostname, uri.port)
-    https.use_ssl = true if base_uri.include? 'https'
+    https.use_ssl = base_uri.include? 'https'
 
     request = Net::HTTP::Post.new(
       uri, initheader = { 'Content-Type' => 'application/json' }
@@ -634,7 +636,7 @@ end
 class MesaTestCase
   attr_reader :test_name, :mesa_dir, :mesa, :success_string, :final_model,
               :failure_msg, :success_msg, :photo, :runtime_seconds,
-              :test_omp_num_threads, :mesa_version, :shell
+              :test_omp_num_threads, :mesa_version, :shell, :mod
   attr_accessor :data_names, :data_types, :failure_type, :success_type,
                 :outcome
 
@@ -785,6 +787,7 @@ class MesaTestCase
     shell.say "Logging test results to #{save_file}...", :blue
     res = {
       'test_case' => test_name,
+      'module' => mod,
       'runtime_seconds' => runtime_seconds,
       'mesa_version' => mesa_version,
       'outcome' => outcome,
@@ -807,6 +810,7 @@ class MesaTestCase
     end
     data = YAML.safe_load(File.read(load_file), [Symbol])
     @runtime_seconds = data['runtime_seconds']
+    @mod = data['module']
     @mesa_version = data['mesa_version']
     @outcome = data['outcome'].to_sym
     @test_omp_num_threads = data['omp_num_threads']
@@ -923,7 +927,14 @@ class MesaTestCase
       system("md5sum \"#{final_model}\" > checks.md5")
       puts "md5sum \"#{final_model}\" > checks.md5"
       FileUtils.cp final_model, 'final_check.mod'
-      return true
+
+      if not photo
+        # if there's no photo, we won't check the checksum, so we've succeeded
+        return succeed(:run_test_string)
+      else
+        # if there is a photo, we'll have to wait and see
+        return true
+      end
     end
 
     # check that final model matches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mesa_test
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json