academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix TestDevSecure on RHEL

Browse Source
This commit is contained in:
Robert Parker
2018-08-24 09:32:41 +01:00
parent d5ec1fa505
commit 1906896038
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-UBUNTU
View File

@@ -154,7 +154,7 @@ build-devjmstest:
.PHONY: test-devserver .PHONY: test-devserver
test-devserver: test/docker/vendor test-devserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END)))
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER) cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
coverage: coverage:
mkdir coverage mkdir coverage

1
test/docker/devconfig_test.go
View File

@@ -70,6 +70,7 @@ func TestDevSecure(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
const tlsPassPhrase string = "passw0rd" const tlsPassPhrase string = "passw0rd"
qm := "qm1" qm := "qm1"
appPassword := "differentPassw0rd" appPassword := "differentPassw0rd"

2
test/docker/devconfig_test_util.go
View File

@@ -26,6 +26,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"os"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
@@ -86,6 +87,7 @@ func runJMSTests(t *testing.T, cli *client.Client, ID string, tls bool, user, pa
"MQ_PORT_1414_TCP_ADDR=" + getIPAddress(t, cli, ID), "MQ_PORT_1414_TCP_ADDR=" + getIPAddress(t, cli, ID),
"MQ_USERNAME=" + user, "MQ_USERNAME=" + user,
"MQ_CHANNEL=DEV.APP.SVRCONN", "MQ_CHANNEL=DEV.APP.SVRCONN",
"IBMJRE=" + os.Getenv("IBMJRE"),
}, },
Image: imageNameDevJMS(), Image: imageNameDevJMS(),
} }

12
test/messaging/src/main/java/com/ibm/mqcontainer/test/JMSTests.java
View File

@@ -84,9 +84,15 @@ class JMSTests {
else { else {
LOGGER.info(String.format("Using TLS. Trust store=%s", TRUSTSTORE)); LOGGER.info(String.format("Using TLS. Trust store=%s", TRUSTSTORE));
SSLSocketFactory ssl = createSSLSocketFactory(); SSLSocketFactory ssl = createSSLSocketFactory();
factory.setSSLSocketFactory(ssl); factory.setSSLSocketFactory(ssl);
factory.setSSLCipherSuite("SSL_RSA_WITH_AES_128_CBC_SHA256"); boolean ibmjre = System.getenv("IBMJRE").equals("true");
// LOGGER.info(Arrays.toString(ssl.getSupportedCipherSuites())); if (ibmjre){
System.setProperty("com.ibm.mq.cfg.useIBMCipherMappings", "true");
factory.setSSLCipherSuite("SSL_RSA_WITH_AES_128_CBC_SHA256");
} else {
System.setProperty("com.ibm.mq.cfg.useIBMCipherMappings", "false");
factory.setSSLCipherSuite("TLS_RSA_WITH_AES_128_CBC_SHA256");
}
} }
// Give up if unable to reconnect for 10 minutes // Give up if unable to reconnect for 10 minutes
// factory.setClientReconnectTimeout(600); // factory.setClientReconnectTimeout(600);