[ARVADOS] updated: e0f4747a2b24af68b474bb2da12e8799440c9acc

git at public.curoverse.com git at public.curoverse.com
Sun Nov 16 20:59:13 EST 2014


Summary of changes:
 .../test/integration/pipeline_instances_test.rb    |  1 +
 sdk/go/keepclient/keepclient_test.go               | 10 +++-
 services/api/app/models/node.rb                    | 55 +++++++++++++++-------
 services/api/config/application.default.yml        | 17 ++++++-
 services/api/config/unbound.template               |  4 ++
 services/api/script/restart-dns-server             | 34 +++++++++++++
 services/api/script/restart-dnsmasq                | 21 ---------
 7 files changed, 100 insertions(+), 42 deletions(-)
 create mode 100644 services/api/config/unbound.template
 create mode 100755 services/api/script/restart-dns-server
 delete mode 100755 services/api/script/restart-dnsmasq

       via  e0f4747a2b24af68b474bb2da12e8799440c9acc (commit)
       via  a128baa147df78cadb5c1657dfa740fad80570ea (commit)
       via  43e019a1e37effa0ccde680b52a61fbba1f858d4 (commit)
       via  7395af3b19b8fc422fe2456c6bead1e7f4c60989 (commit)
       via  a75ef0985d2a385165168cbb488cf97382308549 (commit)
       via  8b7ed36ff057c4a483f4ee8a1c66929425b366c6 (commit)
      from  5d87bcae66870127445e5eb018a69d606e93e244 (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 e0f4747a2b24af68b474bb2da12e8799440c9acc
Author: radhika <radhika at curoverse.com>
Date:   Sun Nov 16 20:58:34 2014 -0500

    4024: add test assertion to check no error in page.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 4aea408..1b8fce6 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -407,6 +407,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
       if expected_min == expected_max
         assert_equal(true, found_count == expected_min,
           "Not found expected number of items. Expected at least #{expected_min} and found #{found_count}")
+        assert page.has_no_text? 'request failed'
       else
         assert_equal(true, found_count>=expected_min,
           "Found too few items. Expected at least #{expected_min} and found #{found_count}")

commit a128baa147df78cadb5c1657dfa740fad80570ea
Merge: 43e019a 7395af3
Author: radhika <radhika at curoverse.com>
Date:   Sun Nov 16 16:18:56 2014 -0500

    Merge branch 'master' into 4024-pipeline-instances-scroll


commit 43e019a1e37effa0ccde680b52a61fbba1f858d4
Merge: 8b7ed36 5d87bca
Author: radhika <radhika at curoverse.com>
Date:   Sun Nov 16 16:18:45 2014 -0500

    Merge branch '4024-pipeline-instances-scroll' of git.curoverse.com:arvados into 4024-pipeline-instances-scroll


commit 8b7ed36ff057c4a483f4ee8a1c66929425b366c6
Merge: bc4992f 3a31350
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 14 14:07:17 2014 -0500

    Merge branch 'master' into 4024-pipeline-instances-scroll


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list