mesa_test 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f7e98c14ccb2a50dbb6f8dda51a5d1291e204c0170b269da687ee05b0c34c25
-  data.tar.gz: a7eb738944fa0523d56886245f5dbbb3a7530051ab9f8fee07c068af7cf59257
+  metadata.gz: 6fc6c58b9993e65c17379bd8094937644a8bf81134da39de66d03cda525d9bde
+  data.tar.gz: 89b1ed5ba1fb2341ef5abab627545c5ea56fd4a9feba32b47b160f7d233af91f
 SHA512:
-  metadata.gz: ada2b9757afbb2dc5b67adc4cca4bdedb0c2a58aec277a9e0bb212cb8f4b72870ab1a89da66066815fa7e0006c2956e46757465e58213a24804ff480ded14206
-  data.tar.gz: de60439ce093ca31d6f86a8e125d21e7e8cd92816741b1310eef634c7e69328cb0a57fe3537aab712138651def446ee12c4fd51ce69203f2950687af3d656840
+  metadata.gz: b8fabe1c51cc00f9fbe0493f4aa4d60da03624d2b2e8e084fe7236b43dac2549ff5f1dc033760add5fda5bde18445a0b08fc5ed178b65971242957560c6e6790
+  data.tar.gz: eb69d91dd90c86f9b585457f38509d3e42a9ab5536be38f0371495aca938d528ed7192e8a1c9ea10ef8282b977c767284bd308f8b9f728df34e89f9c0be43c8c

data/lib/mesa_test.rb

@@ -252,7 +252,6 @@ 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
     }
 
@@ -307,7 +306,6 @@ 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 }
@@ -459,7 +457,7 @@ e-mail and password will be stored in plain text.'
 end
 
 class Mesa
-  SVN_URI = 'svn://svn.code.sf.net/p/mesa/code/trunk'.freeze    
+  SVN_URI = 'https://subversion.assembla.com/svn/mesa\^mesa/trunk'.freeze    
 
   attr_reader :mesa_dir, :test_data, :test_names, :test_cases, :shell,
               :svn_version, :svn_author, :svn_log, :using_sdk
@@ -469,8 +467,7 @@ class Mesa
     using_sdk: true)
     new_mesa_dir ||= File.join(ENV['HOME'], 'mesa-test-r' + version_number.to_s)
     success = bash_execute(
-      "svn co -r #{version_number} " \
-      "svn://svn.code.sf.net/p/mesa/code/trunk #{new_mesa_dir}"
+      "svn co -r #{version_number} #{SVN_URI} #{new_mesa_dir}"
     )
     unless success
       raise MesaDirError, 'Encountered a problem in downloading mesa ' \
@@ -897,7 +894,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, :diff
+              :compiler_version
   attr_accessor :data_names, :data_types, :failure_type, :success_type,
                 :outcome
 
@@ -923,13 +920,7 @@ class MesaTestCase
     @retries = 0
     @backups = 0
     @steps = 0
-    # 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
+    @summary_text = ''
 
     # this overrides the submitters choice if it is non-nil
     @compiler = mesa.using_sdk ? 'SDK' : nil
@@ -943,8 +934,6 @@ 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} " \
@@ -1089,7 +1078,6 @@ class MesaTestCase
       'retries' => retries,
       'backups' => backups,
       'steps' => steps,
-      'diff' => diff,
       'summary_text' => summary_text
     }
     if compiler == 'SDK'
@@ -1121,10 +1109,8 @@ 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
@@ -1263,9 +1249,6 @@ 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
@@ -1274,7 +1257,6 @@ 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'
@@ -1286,7 +1268,6 @@ 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')
@@ -1302,8 +1283,7 @@ 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('photos', "b_#{photo}"))
+           File.exist?(File.join('photos1', photo))
       return fail_test(:photo_file)
     end
 
@@ -1427,17 +1407,6 @@ 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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - William Wolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json