[FAB-8005] Fix CI

troyronda · troyronda · commit ec2110a01e53 · 2018-02-01T12:28:30.000-05:00
Change-Id: I4db638aab4389576c80c6ad8b775c632b7f6fcc4
Signed-off-by: Troy Ronda &lt;troy@troyronda.com&gt;
diff --git a/test/fixtures/config/config_pkcs11_test.yaml b/test/fixtures/config/config_pkcs11_test.yaml
@@ -47,7 +47,7 @@ client:
     timeout:
       connection: 3s
       queryResponse: 45s
-      executeTxResponse: 30s
+      executeTxResponse: 60s
   eventService:
     timeout:
       connection: 3s
diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml
@@ -48,7 +48,7 @@ client:
     timeout:
       connection: 3s
       queryResponse: 45s
-      executeTxResponse: 30s
+      executeTxResponse: 60s
   eventService:
     timeout:
       connection: 3s
diff --git a/test/fixtures/config/config_test_embedded_pems.yaml b/test/fixtures/config/config_test_embedded_pems.yaml
@@ -48,7 +48,7 @@ client:
     timeout:
       connection: 3s
       queryResponse: 45s
-      executeTxResponse: 30s
+      executeTxResponse: 60s
   eventService:
     timeout:
       connection: 3s
diff --git a/test/integration/base_test_setup.go b/test/integration/base_test_setup.go
@@ -134,7 +134,7 @@ func (setup *BaseSetupImpl) Initialize(t *testing.T) error {
 			return errors.WithMessage(err, "SaveChannel failed")
 		}
 
-		time.Sleep(time.Second * 3)
+		time.Sleep(time.Second * 5)
 
 		if err = channel.Initialize(nil); err != nil {
 			return errors.WithMessage(err, "channel init failed")
diff --git a/test/integration/e2e/end_to_end.go b/test/integration/e2e/end_to_end.go
@@ -69,7 +69,7 @@ func Run(t *testing.T, configOpt apiconfig.ConfigProvider, sdkOpts ...fabsdk.Opt
 	}
 
 	// Allow orderer to process channel creation
-	time.Sleep(time.Second * 3)
+	time.Sleep(time.Second * 5)
 
 	// Org resource management client
 	orgResMgmt, err := sdk.NewClient(fabsdk.WithUser(orgAdmin)).ResourceMgmt()
diff --git a/test/integration/orgs/multiple_orgs_test.go b/test/integration/orgs/multiple_orgs_test.go
@@ -69,7 +69,7 @@ func TestOrgsEndToEnd(t *testing.T) {
 	}
 
 	// Allow orderer to process channel creation
-	time.Sleep(time.Second * 3)
+	time.Sleep(time.Second * 5)
 
 	// Org1 resource management client (Org1 is default org)
 	org1ResMgmt, err := sdk.NewClient(fabsdk.WithUser("Admin")).ResourceMgmt()

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (setup BaseSetupImpl) Initialize(t testing.T) error {`
`134`	`134`	`return errors.WithMessage(err, "SaveChannel failed")`
`135`	`135`	`}`
`136`	`136`
`137`		`- time.Sleep(time.Second * 3)`
	`137`	`+ time.Sleep(time.Second * 5)`
`138`	`138`
`139`	`139`	`if err = channel.Initialize(nil); err != nil {`
`140`	`140`	`return errors.WithMessage(err, "channel init failed")`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func Run(t *testing.T, configOpt apiconfig.ConfigProvider, sdkOpts ...fabsdk.Opt`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Allow orderer to process channel creation`
`72`		`- time.Sleep(time.Second * 3)`
	`72`	`+ time.Sleep(time.Second * 5)`
`73`	`73`
`74`	`74`	`// Org resource management client`
`75`	`75`	`orgResMgmt, err := sdk.NewClient(fabsdk.WithUser(orgAdmin)).ResourceMgmt()`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func TestOrgsEndToEnd(t *testing.T) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Allow orderer to process channel creation`
`72`		`- time.Sleep(time.Second * 3)`
	`72`	`+ time.Sleep(time.Second * 5)`
`73`	`73`
`74`	`74`	`// Org1 resource management client (Org1 is default org)`
`75`	`75`	`org1ResMgmt, err := sdk.NewClient(fabsdk.WithUser("Admin")).ResourceMgmt()`