[FAB-10472] Fix configless e2e test

Load certs and keys before referencing them or else the bytes will be nil. Change-Id: Id24fcf4be4d8fe6b4b11ef3dda3e667e37387abb Signed-off-by: Bob Stasyszyn <[email protected]>
hyperledger · May 30, 2018 · 58ce93d · 58ce93d
1 parent c247930
commit 58ce93d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/test/integration/e2e/configless/endpointconfig_override_test.go b/test/integration/e2e/configless/endpointconfig_override_test.go
@@ -732,6 +732,10 @@ func (m *exampleTLSClientCerts) TLSClientCerts() ([]tls.Certificate, error) {
 		m.RWLock = &sync.RWMutex{}
 	}
 	var clientCerts tls.Certificate
+	err := clientConfig.TLSCerts.Client.Cert.LoadBytes()
+	if err != nil {
+		return nil, err
+	}
 	cb := clientConfig.TLSCerts.Client.Cert.Bytes()
 
 	if len(cb) == 0 {
@@ -760,10 +764,14 @@ func (m *exampleTLSClientCerts) TLSClientCerts() ([]tls.Certificate, error) {
 }
 func (m *exampleTLSClientCerts) loadPrivateKeyFromConfig(clientConfig *msp.ClientConfig, clientCerts tls.Certificate, cb []byte) ([]tls.Certificate, error) {
 
+	err := clientConfig.TLSCerts.Client.Key.LoadBytes()
+	if err != nil {
+		return nil, err
+	}
 	kb := clientConfig.TLSCerts.Client.Key.Bytes()
 
 	// load the key/cert pair from []byte
-	clientCerts, err := tls.X509KeyPair(cb, kb)
+	clientCerts, err = tls.X509KeyPair(cb, kb)
 	if err != nil {
 		return nil, errors.Errorf("Error loading cert/key pair as TLS client credentials: %v", err)
 	}