[ARVADOS] updated: 2.1.0-2262-gad6dd2b55

[Git user]

Summary of changes:
 .../test/integration/pipeline_instances_test.rb    | 24 ----------------------
 lib/config/load_test.go                            |  6 +-----
 .../controllers/arvados/v1/groups_controller.rb    |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

       via  ad6dd2b5553d7ab2f7f800483c4aafc3db6ebb9a (commit)
       via  774529a2a0931185941069ce1db4591592be0fc6 (commit)
       via  028a29384e8580b99a49b89c74dd7d5dfb3cedd6 (commit)
      from  403afd6c31b4a76ca92e4df605b8cf15ba77b9a7 (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 ad6dd2b5553d7ab2f7f800483c4aafc3db6ebb9a
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 15:11:41 2022 -0400

    18995: remove useless if statement.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index b6e86d8ae..732e36099 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -37,30 +37,6 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     DateTime.parse(utc).to_time
   end
 
-  if false
-    # No need to test (or mention) these all the time. If they start
-    # working (without need_selenium) then some real tests might not
-    # need_selenium any more.
-
-    test 'phantomjs DST' do
-      skip '^^'
-      t0s = '3/8/2015, 01:59 AM'
-      t1s = '3/8/2015, 03:01 AM'
-      t0 = parse_browser_timestamp t0s
-      t1 = parse_browser_timestamp t1s
-      assert_equal 120, t1-t0, "'#{t0s}' to '#{t1s}' was reported as #{t1-t0} seconds, should be 120"
-    end
-
-    test 'phantomjs DST 2' do
-      skip '^^'
-      t0s = '2015-03-08T10:43:00Z'
-      t1s = '2015-03-09T03:43:00Z'
-      t0 = parse_browser_timestamp page.evaluate_script("new Date('#{t0s}').toLocaleString()")
-      t1 = parse_browser_timestamp page.evaluate_script("new Date('#{t1s}').toLocaleString()")
-      assert_equal 17*3600, t1-t0, "'#{t0s}' to '#{t1s}' was reported as #{t1-t0} seconds, should be #{17*3600} (17 hours)"
-    end
-  end
-
   test 'view pipeline with job and see graph' do
     visit page_with_token('active_trustedclient', '/pipeline_instances')
     assert page.has_text? 'pipeline_with_job'

commit 774529a2a0931185941069ce1db4591592be0fc6
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 15:09:36 2022 -0400

    18995: remove useless if statement.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index 5270dcccc..2d87b906c 100644
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -338,11 +338,7 @@ func (s *LoadSuite) TestUnacceptableTokens(c *check.C) {
 	} {
 		c.Logf("trying bogus config: %s", trial.example)
 		_, err := testLoader(c, "Clusters:\n zzzzz:\n  "+trial.example, nil).Load()
-		if trial.short {
-			c.Check(err, check.ErrorMatches, `Clusters.zzzzz.`+trial.configPath+`: unacceptable characters in token.*`)
-		} else {
-			c.Check(err, check.ErrorMatches, `Clusters.zzzzz.`+trial.configPath+`: unacceptable characters in token.*`)
-		}
+		c.Check(err, check.ErrorMatches, `Clusters.zzzzz.`+trial.configPath+`: unacceptable characters in token.*`)
 	}
 }
 

commit 028a29384e8580b99a49b89c74dd7d5dfb3cedd6
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 15:05:38 2022 -0400

    18995: remove dead code.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index c1dc7a496..8539332f1 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -104,7 +104,6 @@ class Arvados::V1::GroupsController < ApplicationController
   def destroy
     if !TRASHABLE_CLASSES.include?(@object.group_class)
       return @object.destroy
-      show
     else
       super # Calls destroy from TrashableController module
     end

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


hooks/post-receive
--