Provide two metrics.rb files, one for client-tests, one for server-tests

cyber-dojo · Jul 22, 2020 · 1843d95 · 1843d95
1 parent d7ddaac
commit 1843d95
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 26 deletions.
diff --git a/sh/test_in_containers.sh b/sh/test_in_containers.sh
@@ -77,7 +77,7 @@ run_tests()
     --rm \
     --volume ${reports_dir}/${test_log}:${tmp_dir}/${test_log}:ro \
     --volume ${reports_dir}/index.html:${tmp_dir}/index.html:ro \
-    --volume ${test_dir}/metrics.rb:/app/metrics.rb:ro \
+    --volume ${test_dir}/metrics_${type}.rb:/app/metrics.rb:ro \
     cyberdojo/check-test-results:latest \
     sh -c "ruby /app/check_test_results.rb ${tmp_dir}/${test_log} ${tmp_dir}/index.html" \
       | tee -a ${reports_dir}/${test_log}

diff --git a/test/metrics.rb b/test/metrics.rb
diff --git a/test.old/client/metrics.rb → test/metrics_client.rb b/test.old/client/metrics.rb → test/metrics_client.rb
diff --git a/test.old/server/metrics.rb → test/metrics_server.rb b/test.old/server/metrics.rb → test/metrics_server.rb
diff --git a/test/reports/.resultset.json b/test/reports/.resultset.json
@@ -17090,6 +17090,6 @@
         null
       ]
     },
-    "timestamp": 1595363377
+    "timestamp": 1595395391
   }
 }
diff --git a/test/reports/index.html b/test/reports/index.html
@@ -14,7 +14,7 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2020-07-21T20:29:37+00:00">2020-07-21T20:29:37+00:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2020-07-22T05:23:11+00:00">2020-07-22T05:23:11+00:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

diff --git a/test/reports/test.log b/test/reports/test.log
@@ -1,27 +1,27 @@
-Run options: --seed 65441
+Run options: --seed 45980
 
 # Running:
 
 ..
 
-Finished in 1.300626s, 1.5377 runs/s, 4.6132 assertions/s.
+Finished in 1.304226s, 1.5335 runs/s, 4.6004 assertions/s.
 
 2 runs, 6 assertions, 0 failures, 0 errors, 0 skips
 Coverage report generated for MiniTest to //tmp/reports. 2906 / 5605 LOC (51.85%) covered.
 
 Slowest 2 tests are...
-0.6801 - 2378A1 - Ubuntu - C (clang), assert - start-files image_name<->os correspondence - client_os_image_test.rb:12
-0.6179 - 2378A1 - Alpine - C#, NUnit - start-files image_name<->os correspondence - client_os_image_test.rb:12
+0.6656 - 2378A1 - Ubuntu - C (clang), assert - start-files image_name<->os correspondence - client_os_image_test.rb:12
+0.6357 - 2378A1 - Alpine - C#, NUnit - start-files image_name<->os correspondence - client_os_image_test.rb:12
 
 
                  failures |       0   <=     0 | [32m true [0m
                    errors |       0   <=     0 | [32m true [0m
                  warnings |       0   <=     0 | [32m true [0m
                     skips |       0   <=     0 | [32m true [0m
-        duration(test)[s] |     1.3   <=   200 | [32m true [0m
+        duration(test)[s] |     1.3   <=   100 | [32m true [0m
                     tests |       2   >=     1 | [32m true [0m
       coverage(tested)[%] |   83.21   >=   100 | [31m false [0m
       coverage(tester)[%] |   100.0   >=   100 | [32m true [0m
-     lines(tester/tested) |    0.08   >=   1.9 | [31m false [0m
-      hits(tested/tester) |    0.80   >=   1.6 | [31m false [0m
+     lines(tester/tested) |    0.08   >=   1.8 | [31m false [0m
+      hits(tested/tester) |    0.80   >=   5.0 | [31m false [0m