Test fixes for RHEL image

This commit is contained in:
Robert Parker
2018-08-21 11:49:56 +01:00
parent 8bdba41f75
commit 0281e52b47
2 changed files with 7 additions and 3 deletions

View File

@@ -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

View File

@@ -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")
}
}