[FAB-11329] fix flakes in pvtdata e2e tests

this change set aims to fix intermittent failures in pvtdata e2e
test. the change set will also enable the tests after those were
disabled as a result of the failures.

FAB-11329 #done

Change-Id: Ie9f0f6498c2cb5e7d455f5d321852f17b7d834ff
Signed-off-by: nirro <nirro@il.ibm.com>

Author: nirrozenbaum

integration/pvtdata/e2e_test.go

@@ -41,7 +41,7 @@ var _ = Describe("PrivateData-EndToEnd", func() {
 	// 2. collectionMarblePrivateDetails - Org2 and Org3 have access to this collection
 	// when calling QueryChaincode with first arg "readMarble", it will query collectionMarbles[1]
 	// when calling QueryChaincode with first arg "readMarblePrivateDetails", it will query collectionMarblePrivateDetails[2]
-	PDescribe("collection config is modified", func() {
+	Describe("collection config is modified", func() {
 		BeforeEach(func() {
 			var err error
 			testDir, err = ioutil.TempDir("", "e2e-pvtdata")
@@ -227,7 +227,7 @@ var _ = Describe("PrivateData-EndToEnd", func() {
 		})
 	})
 
-	PDescribe("collection config BlockToLive is respected", func() {
+	Describe("collection config BlockToLive is respected", func() {
 		BeforeEach(func() {
 			var err error
 			testDir, err = ioutil.TempDir("", "e2e-pvtdata")
@@ -316,15 +316,20 @@ var _ = Describe("PrivateData-EndToEnd", func() {
 				return adminRunner.Err(), err
 			}).Should(gbytes.Say("Successfully submitted proposal to join channel"))
 
+			By("install the chaincode on peer1.org2 in order to query it")
+			adminPeer.InstallChaincode("marblesp", "1.0", "github.com/hyperledger/fabric/integration/chaincode/marbles_private/cmd")
+
 			By("fetch latest blocks to peer1.org2")
 			EventuallyWithOffset(1, func() (*gbytes.Buffer, error) {
 				adminRunner := adminPeer.FetchChannel(d.Channel, filepath.Join(w.Rootpath, "peer1.org2.example.com", fmt.Sprintf("%s_block.pb", d.Channel)), "newest", d.Orderer)
 				err := helpers.Execute(adminRunner)
 				return adminRunner.Err(), err
 			}).Should(gbytes.Say("Received block: 9"))
 
-			By("install the chaincode on peer1.org2 in order to query it")
-			adminPeer.InstallChaincode("marblesp", "1.0", "github.com/hyperledger/fabric/integration/chaincode/marbles_private/cmd")
+			By("wait until ledger is updated with all blocks")
+			EventuallyWithOffset(1, func() int {
+				return getLedgerHeight(1, 2, d.Channel, testDir)
+			}, time.Minute).Should(Equal(10))
 
 			By("query peer1.org2, verify marble1 exist in collectionMarbles and private data doesn't exist")
 			verifyAccess(d.Chaincode.Name, d.Channel, `{"Args":["readMarble","marble1"]}`, []*runner.Peer{adminPeer}, `{"docType":"marble","name":"marble1","color":"blue","size":35,"owner":"tom"}`)