[ARVADOS] updated: f4804e16eadabb6fa601449ef332a4235358c503

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/websockets_test.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  f4804e16eadabb6fa601449ef332a4235358c503 (commit)
      from  1af3397c28837ff61d3538e14b7358281b38097a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f4804e16eadabb6fa601449ef332a4235358c503
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Fri Nov 28 12:13:09 2014 +0100

    4233: websocket test of log charting should look at the right datapoint

diff --git a/apps/workbench/test/integration/websockets_test.rb b/apps/workbench/test/integration/websockets_test.rb
index 7a8d774..c22b3ff 100644
--- a/apps/workbench/test/integration/websockets_test.rb
+++ b/apps/workbench/test/integration/websockets_test.rb
@@ -175,7 +175,8 @@ class WebsocketTest < ActionDispatch::IntegrationTest
                 properties: {"text" => text}}})
     wait_for_ajax
 
-    cpu_stat = page.evaluate_script("jobGraphData[0]['cpu-1']")
+    # using datapoint 1 instead of datapoint 0 because there will be a "dummy" datapoint with no actual stats 10 minutes previous to the one we're looking for, for the sake of making the x-axis of the graph show a full 10 minutes of time even though there is only a single real datapoint
+    cpu_stat = page.evaluate_script("jobGraphData[1]['T1-cpu']")
 
     assert_equal 45.3, (cpu_stat.to_f*100).round(1)
 
@@ -188,10 +189,11 @@ class WebsocketTest < ActionDispatch::IntegrationTest
     visit page_with_token "admin", "/jobs/#{uuid}"
     click_link "Log"
 
-    ApiServerForTests.new.run_rake_task("replay_job_log", "test/job_logs/crunchstatshort.log,#{uuid}")
+    ApiServerForTests.new.run_rake_task("replay_job_log", "test/job_logs/crunchstatshort.log,1.0,#{uuid}")
     wait_for_ajax
 
-    cpu_stat = page.evaluate_script("jobGraphData[0]['cpu-1']")
+    # see above comment as to why we use datapoint 1 rather than 0
+    cpu_stat = page.evaluate_script("jobGraphData[1]['T1-cpu']")
 
     assert_equal 45.3, (cpu_stat.to_f*100).round(1)
   end

-----------------------------------------------------------------------


hooks/post-receive
--