From f306d645e48fb8771503a0214377b22734346af1 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Tue, 27 Feb 2018 00:30:09 -0500 Subject: [PATCH 1/2] fix bug for case rspconfig_set_hostname_equal_star_with_bmc_is_hostname --- xCAT-test/autotest/testcase/rspconfig/cases0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/rspconfig/cases0 b/xCAT-test/autotest/testcase/rspconfig/cases0 index c5c0a8183..5dc0ee6a8 100644 --- a/xCAT-test/autotest/testcase/rspconfig/cases0 +++ b/xCAT-test/autotest/testcase/rspconfig/cases0 @@ -269,7 +269,9 @@ cmd:mkdir -p /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname check:rc == 0 cmd:lsdef $$CN -z > /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/$$CN.stanza check:rc == 0 -cmd:chdef -t node -o bogus_bmc_hostname groups=bmc ip=10.6.17.100 +cmd:chdef -t node -o bogus_bmc_hostname groups=bmc ip=__GETNODEATTR($$CN,bmc)__ +check:rc == 0 +cmd:lsdef bogus_bmc_hostname check:rc == 0 cmd:makehosts bogus_bmc_hostname check:rc == 0 From 172b14cd17af48a5b9a68a70df7d369011a94c96 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Tue, 27 Feb 2018 00:45:18 -0500 Subject: [PATCH 2/2] modify reventlog cases for matching the output of openbmc --- xCAT-test/autotest/testcase/reventlog/cases0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0 index 7a1e7a1a1..82fa7cc30 100644 --- a/xCAT-test/autotest/testcase/reventlog/cases0 +++ b/xCAT-test/autotest/testcase/reventlog/cases0 @@ -7,7 +7,7 @@ end start:reventlog_all cmd:reventlog $$CN all check:rc==0 -check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+ +check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|No attributes returned from the BMC end start:reventlog_clear @@ -19,7 +19,7 @@ end start:reventlog_numofentries cmd:reventlog $$CN 5 check:rc==0 -check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry +check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry|No attributes returned from the BMC end start:reventlog_s_openbmc