mesa_test 0.1.5 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mesa_test.rb +28 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 83dd219ff4bd0ab2775b8aa9f0499be901611fbfac3ae6bf24f8a3641d86d1c8
|
4
|
+
data.tar.gz: 6cabcfdaf08dade75fe045b4e771107b9b2a70df57027cb5a15453e4ef73c5e0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d409f946cb32abb2f1c27d8e3516052f2bc1fd706032bef9dc0a0876c84cae86980a5b7c060505708afd3ad20065c675681d6ec05c53305c6cb26d97feb6e3ba
|
7
|
+
data.tar.gz: e5d46b80e6942a075c2d3c1dd7c55d5ad519309d9fb307f8fc9ba960c301a30a0497c5362d504a136f7d72cd3d16068637859d37efab015bf0fa887f72e608e8
|
data/lib/mesa_test.rb
CHANGED
@@ -252,6 +252,7 @@ e-mail and password will be stored in plain text.'
|
|
252
252
|
steps: test_case.steps,
|
253
253
|
retries: test_case.retries,
|
254
254
|
backups: test_case.backups,
|
255
|
+
diff: test_case.diff,
|
255
256
|
summary_text: test_case.summary_text
|
256
257
|
}
|
257
258
|
|
@@ -306,6 +307,7 @@ e-mail and password will be stored in plain text.'
|
|
306
307
|
steps: test_case.steps,
|
307
308
|
retries: test_case.retries,
|
308
309
|
backups: test_case.backups,
|
310
|
+
diff: test_case.diff,
|
309
311
|
summary_text: test_case.summary_text
|
310
312
|
},
|
311
313
|
extra: { test_case: test_name, mod: mod }
|
@@ -895,7 +897,7 @@ class MesaTestCase
|
|
895
897
|
:failure_msg, :success_msg, :photo, :runtime_seconds,
|
896
898
|
:test_omp_num_threads, :mesa_version, :shell, :mod, :retries,
|
897
899
|
:backups, :steps, :runtime_minutes, :summary_text, :compiler,
|
898
|
-
:compiler_version
|
900
|
+
:compiler_version, :diff
|
899
901
|
attr_accessor :data_names, :data_types, :failure_type, :success_type,
|
900
902
|
:outcome
|
901
903
|
|
@@ -921,7 +923,13 @@ class MesaTestCase
|
|
921
923
|
@retries = 0
|
922
924
|
@backups = 0
|
923
925
|
@steps = 0
|
924
|
-
|
926
|
+
# 2 (default) means uknown. Updated by running or loading data.
|
927
|
+
# 1 means did diffs (not update_checksums; like each_test_run_and_diff)
|
928
|
+
# 0 means no diffs (update_checksums; like each_test_run)
|
929
|
+
@diff = 2
|
930
|
+
|
931
|
+
# note: this gets overridden for new runs, so this is probably irrelevant
|
932
|
+
@summary_text = nil
|
925
933
|
|
926
934
|
# this overrides the submitters choice if it is non-nil
|
927
935
|
@compiler = mesa.using_sdk ? 'SDK' : nil
|
@@ -1079,6 +1087,7 @@ class MesaTestCase
|
|
1079
1087
|
'retries' => retries,
|
1080
1088
|
'backups' => backups,
|
1081
1089
|
'steps' => steps,
|
1090
|
+
'diff' => diff,
|
1082
1091
|
'summary_text' => summary_text
|
1083
1092
|
}
|
1084
1093
|
if compiler == 'SDK'
|
@@ -1110,8 +1119,10 @@ class MesaTestCase
|
|
1110
1119
|
@retries = data['retries'] || @retries
|
1111
1120
|
@backups = data['backups'] || @backups
|
1112
1121
|
@steps = data['steps'] || @steps
|
1122
|
+
@diff = data['diff'] || @diff
|
1113
1123
|
@summary_text = data['summary_text'] || @summary_text
|
1114
1124
|
@compiler = data['compiler'] || @compiler
|
1125
|
+
|
1115
1126
|
@compiler_version = data['compiler_version'] || @compiler_version
|
1116
1127
|
|
1117
1128
|
# convert select data to symbols since that is how they are used
|
@@ -1258,6 +1269,7 @@ class MesaTestCase
|
|
1258
1269
|
# if this is false, behave like each_test_run_and_diff. assume
|
1259
1270
|
# the checksum is up-to-date and check it matches after rn and re.
|
1260
1271
|
if @mesa.update_checksums
|
1272
|
+
@diff = 0 # this means no diffs run
|
1261
1273
|
puts "md5sum \"#{final_model}\" > checks.md5"
|
1262
1274
|
bash_execute("md5sum \"#{final_model}\" > checks.md5")
|
1263
1275
|
FileUtils.cp final_model, 'final_check.mod'
|
@@ -1269,6 +1281,7 @@ class MesaTestCase
|
|
1269
1281
|
end
|
1270
1282
|
|
1271
1283
|
# check that final model matches
|
1284
|
+
@diff = 1 # this means diffs were run
|
1272
1285
|
puts './ck >& final_check_diff.txt'
|
1273
1286
|
return fail_test(:run_checksum) unless
|
1274
1287
|
bash_execute('./ck >& final_check_diff.txt')
|
@@ -1284,7 +1297,8 @@ class MesaTestCase
|
|
1284
1297
|
|
1285
1298
|
# check that photo file actually exists
|
1286
1299
|
unless File.exist?(File.join('photos', photo)) ||
|
1287
|
-
File.exist?(File.join('photos1', photo))
|
1300
|
+
File.exist?(File.join('photos1', photo)) ||
|
1301
|
+
File.exist?(File.join('photos', "b_#{photo}"))
|
1288
1302
|
return fail_test(:photo_file)
|
1289
1303
|
end
|
1290
1304
|
|
@@ -1408,6 +1422,17 @@ class MesaTestCase
|
|
1408
1422
|
end
|
1409
1423
|
|
1410
1424
|
def get_summary_text
|
1425
|
+
# original plan was to include diff data in summary text... now it's just
|
1426
|
+
# part of the test_instance object and is submitted as an integer
|
1427
|
+
# res = case diff
|
1428
|
+
# when 0
|
1429
|
+
# "No Diff\n"
|
1430
|
+
# when 1
|
1431
|
+
# "Diff\n"
|
1432
|
+
# else
|
1433
|
+
# "Ambiguous Diff\n"
|
1434
|
+
# end
|
1435
|
+
# res +
|
1411
1436
|
IO.readlines(out_file).select do |line|
|
1412
1437
|
line =~ /^\s*runtime/
|
1413
1438
|
end.join
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mesa_test
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Wolf
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-03-
|
11
|
+
date: 2017-03-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: json
|