From 0281e52b472c017880e43424f4c4a512fc3ae4b1 Mon Sep 17 00:00:00 2001 From: Robert Parker Date: Tue, 21 Aug 2018 11:49:56 +0100 Subject: [PATCH] Test fixes for RHEL image --- mq-advanced-server-rhel/install-mq-rhel.sh | 3 +++ test/docker/docker_api_test.go | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mq-advanced-server-rhel/install-mq-rhel.sh b/mq-advanced-server-rhel/install-mq-rhel.sh index c3c98d9..4bf7472 100755 --- a/mq-advanced-server-rhel/install-mq-rhel.sh +++ b/mq-advanced-server-rhel/install-mq-rhel.sh @@ -56,6 +56,9 @@ find $scratchmnt/opt/mqm -name '*.tar.gz' -delete # Recommended: Set the default MQ installation (makes the MQ commands available on the PATH) buildah run $ctr -- /opt/mqm/bin/setmqinst -p /opt/mqm -i +mkdir -p $scratchmnt/run/runmqserver +chown 888:888 $scratchmnt/run/runmqserver + # Optional: Set these values for the IBM Cloud Vulnerability Report sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t90/' $scratchmnt/etc/login.defs sed -i 's/PASS_MIN_DAYS\t0/PASS_MIN_DAYS\t1/' $scratchmnt/etc/login.defs diff --git a/test/docker/docker_api_test.go b/test/docker/docker_api_test.go index b5f05a5..aaa26e2 100644 --- a/test/docker/docker_api_test.go +++ b/test/docker/docker_api_test.go @@ -684,10 +684,11 @@ func TestVersioning(t *testing.T) { dataAr := strings.Split(line, " ") data := dataAr[len(dataAr)-1] - // Verify created + // Verify created is in a known timestamp format _, err := time.Parse(time.RFC3339, data) - if err != nil { - t.Errorf("Failed to validate Image created (%v) - %v", data, err) + _, err2 := time.Parse("2006-01-02T15:04:05-0700", data) + if err != nil && err2 != nil { + t.Errorf("Failed to validate Image created stamp (%v) - %v or %v", data, time.RFC3339, "2006-01-02T15:04:05-0700") } }