[ARVADOS] updated: 7253b0d4cdf9612a4c0de0ca849979cec5e8d382

[git at public.curoverse.com]

Summary of changes:
 .../controllers/collections_controller_test.rb     |  4 +-
 .../test/controllers/projects_controller_test.rb   |  6 +--
 .../test/controllers/users_controller_test.rb      | 14 +++----
 docker/build_tools/Makefile                        | 10 ++++-
 sdk/python/tests/run_test_server.py                | 34 ++++++++++++++++-
 .../arvados/v1/virtual_machines_controller.rb      | 44 +++++++++++++---------
 .../arvados/v1/virtual_machines_controller_test.rb | 21 +++++++++++
 7 files changed, 99 insertions(+), 34 deletions(-)

       via  7253b0d4cdf9612a4c0de0ca849979cec5e8d382 (commit)
       via  1856a3a1e9c95b4db4742ab53f737e91dbf46cff (commit)
       via  7365909fd21f8016e7b676cfca2a1ad28781e690 (commit)
       via  8e1477dea24ed50b09c055092314fb6522c5a114 (commit)
       via  df070cb903ec46ce51eb610d44530369a824b12b (commit)
       via  97374cec874aaaaeb92eeb962bf580bdba199be9 (commit)
       via  46da2daa12366c10d7e175de8c46d964a2e06aac (commit)
      from  14dbdda455cb0e49b8848575337c5e7806747ee7 (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 7253b0d4cdf9612a4c0de0ca849979cec5e8d382
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 11:35:55 2015 -0400

    6465-Made changes that were recommended.

diff --git a/apps/workbench/test/controllers/collections_controller_test.rb b/apps/workbench/test/controllers/collections_controller_test.rb
index 7d64384..13644e0 100644
--- a/apps/workbench/test/controllers/collections_controller_test.rb
+++ b/apps/workbench/test/controllers/collections_controller_test.rb
@@ -494,7 +494,7 @@ class CollectionsControllerTest < ActionController::TestCase
     assert matches.size > 1
 
     matches.each do |k,v|
-      assert_match /href="\/collections\/#{v['uuid']}".*#{v['name']}<\/a>/, @response.body
+      assert_match /href="\/collections\/#{v['uuid']}">.*#{v['name']}<\/a>/, @response.body
     end
 
     assert_includes @response.body, 'The following collections have this content:'
@@ -507,7 +507,7 @@ class CollectionsControllerTest < ActionController::TestCase
     collection = api_fixture('collections')['foo_file']
     get :show, {id: collection['uuid']}, session_for(:active)
     assert_includes @response.body, collection['name']
-    assert_match /href="#{collection['uuid']}.*foo.*/, @response.body
+    assert_match /href="#{collection['uuid']}\/foo" ><\/i> foo</, @response.body
   end
 
   test "No Upload tab on non-writable collection" do
diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index a036a8f..7f2b2cd 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -334,8 +334,7 @@ class ProjectsControllerTest < ActionController::TestCase
     found.description = 'Textile description with link to home page <a href="/">take me home</a>.'
     found.save!
     get(:show, {id: project['uuid']}, session_for(:active))
-    assert_not_includes 'Textile description with link to home page <a href="/">take me home</a>.', @response.body
-    assert_match /Textile description with link to home page .*a href=.*take me home.*\/a.*./, @response.body
+    assert_includes @response.body, 'Textile description with link to home page <a href="/">take me home</a>.'
   end
 
   test "find a project and edit description to textile description with link to object" do
@@ -345,8 +344,7 @@ class ProjectsControllerTest < ActionController::TestCase
     found.description = '"Link to object":' + api_fixture('groups')['asubproject']['uuid']
     found.save!
     get(:show, {id: project['uuid']}, session_for(:active))
-    assert_not_includes '"Link to object"', @response.body
-    assert_match /href=.*Link to object.*\/a./, @response.body
+    refute_includes  @response.body,'"Link to object"'
     refute_empty css_select('[href="/groups/zzzzz-j7d0g-axqo7eu9pwvna1x"]')
   end
 
diff --git a/apps/workbench/test/controllers/users_controller_test.rb b/apps/workbench/test/controllers/users_controller_test.rb
index f439d6e..6b9cd6e 100644
--- a/apps/workbench/test/controllers/users_controller_test.rb
+++ b/apps/workbench/test/controllers/users_controller_test.rb
@@ -85,16 +85,16 @@ class UsersControllerTest < ActionController::TestCase
       active_user = api_fixture('users','active')
       get :index, {}, session_for(username)
       if username == 'admin'
-        assert_match /<a href="\/projects\/#{admin_user['uuid']}">Home<\/a.*./, @response.body
-        assert_match /<a href="\/projects\/#{active_user['uuid']}">Home<\/a.*./, @response.body
-        assert_match /<a.*href="\/users\/#{admin_user['uuid']}".*Show<\/a.*./, @response.body
-        assert_match /<a.*href="\/users\/#{active_user['uuid']}".*Show<\/a.*./, @response.body
+        assert_match /<a href="\/projects\/#{admin_user['uuid']}">Home<\/a>/, @response.body
+        assert_match /<a href="\/projects\/#{active_user['uuid']}">Home<\/a>/, @response.body
+        assert_match /href="\/users\/#{admin_user['uuid']}" title="show user"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+        assert_match /href="\/users\/#{active_user['uuid']}" title="show user"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
         assert_includes @response.body, admin_user['email']
         assert_includes @response.body, active_user['email']
       else
-        refute_match  /a href=.*Home<.*\/a.*./, @response.body
-        refute_match /<a.*href="\/users\/#{admin_user['uuid']}".*Show<\/a.*./, @response.body
-        assert_match /<a.*href="\/users\/#{active_user['uuid']}".*Show<\/a.*./, @response.body
+        refute_match  /Home<\/a>/, @response.body
+        refute_match /href="\/users\/#{admin_user['uuid']}" title="show user"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
+        assert_match /href="\/users\/#{active_user['uuid']}" title="show user"><i class="fa fa-fw fa-user"><\/i> Show<\/a/, @response.body
         assert_includes @response.body, active_user['email']
       end
     end

commit 1856a3a1e9c95b4db4742ab53f737e91dbf46cff
Merge: 14dbdda 7365909
Author: Manoj <jonam33 at gmail.com>
Date:   Thu Jul 16 15:18:13 2015 -0400

    Merge branch 'master' of git.curoverse.com:arvados into 6465-optimize-workbench-integration-tests


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


hooks/post-receive
--