[FABG-805] MSP tests failing against Fabric 1.4 RC

Reproduced and fixed against locally built fabric and
fabric-ca 1.4 RC, in preparation for FABG-804.

Change-Id: I8efd326886cc92c05a984d2c58406bd28f0dfa3e
Signed-off-by: Aleksandar Likic <[email protected]>

test/integration/pkg/client/msp/enrollment_test.go

@@ -128,6 +128,16 @@ func TestEnrollWithOptions(t *testing.T) {
 		t.Fatalf("failed to create CA client: %s", err)
 	}
 
+	// As this integration test spawns a fresh CA instance,
+	// we have to enroll the CA registrar first. Otherwise,
+	// CA operations that require the registrar's identity
+	// will be rejected by the CA.
+	registrarEnrollID, registrarEnrollSecret := getRegistrarEnrollmentCredentials(t, ctxProvider)
+	err = mspClient.Enroll(registrarEnrollID, msp.WithSecret(registrarEnrollSecret))
+	if err != nil {
+		t.Fatalf("Enroll failed: %s", err)
+	}
+
 	// Generate a random user name
 	username := integration.GenerateRandomID()
 
@@ -209,6 +219,16 @@ func TestEnrollWithProfile(t *testing.T) {
 		t.Fatalf("failed to create CA client: %s", err)
 	}
 
+	// As this integration test spawns a fresh CA instance,
+	// we have to enroll the CA registrar first. Otherwise,
+	// CA operations that require the registrar's identity
+	// will be rejected by the CA.
+	registrarEnrollID, registrarEnrollSecret := getRegistrarEnrollmentCredentials(t, ctxProvider)
+	err = mspClient.Enroll(registrarEnrollID, msp.WithSecret(registrarEnrollSecret))
+	if err != nil {
+		t.Fatalf("Enroll failed: %s", err)
+	}
+
 	// Generate a random user name
 	username := integration.GenerateRandomID()