[ARVADOS] updated: 2.1.0-218-g11cb21a34

[Git user]

Summary of changes:
 lib/controller/integration_test.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

       via  11cb21a34a57ac90fb070aead29e8db440e032fc (commit)
      from  f7165287f20f3c9f7f2837053f94631366242cea (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 11cb21a34a57ac90fb070aead29e8db440e032fc
Author: Nico Cesar <nico at nicocesar.com>
Date:   Mon Dec 14 13:29:42 2020 -0500

    Improved integration_test.go
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 0ff897c35..0567d43fa 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -616,15 +616,14 @@ func (s *IntegrationSuite) TestIntermediateCluster(c *check.C) {
 	conn1 := s.conn("z1111")
 	rootctx1, _, _ := s.rootClients("z1111")
 	uctx1, ac1, _, _ := s.userClients(rootctx1, c, conn1, "z1111", true)
-	//conn2 := s.conn("z2222")
-	//rootctx2, _, _ := s.rootClients("z2222")
-	//_, ac2, _, _ := s.userClients(rootctx2, c, conn2, "z2222", true)
 
 	tests := []struct {
-		name  string
-		token string
+		name                 string
+		token                string
+		expectedRuntimeToken string
+		expectedUUIDprefix   string
 	}{
-		{"Good token z1111 user sending a CR to z2222", ac1.AuthToken},
+		{"Good token z1111 user sending a CR to z2222", ac1.AuthToken, "", "z2222-xvhdp-"},
 	}
 
 	for _, tt := range tests {
@@ -639,9 +638,8 @@ func (s *IntegrationSuite) TestIntermediateCluster(c *check.C) {
 		cr, err := conn1.ContainerRequestCreate(uctx1, arvados.CreateOptions{ClusterID: "z2222", Attrs: rq})
 
 		c.Check(err, check.IsNil)
-		c.Check(cr, check.NotNil)
-		c.Check(cr.UUID, check.Not(check.Equals), "")
-
+		c.Check(strings.HasPrefix(cr.UUID, tt.expectedUUIDprefix), check.Equals, true)
+		c.Check(cr.RuntimeToken, check.Equals, tt.expectedRuntimeToken)
 	}
 }
 

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


hooks/post-receive
--