From 092cf75d8b0c6c51b6f3f99e407245b506f26433 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Mon, 7 Nov 2016 12:11:48 +0800 Subject: [PATCH 1/2] Add more test cases for command updatenode --- xCAT-test/autotest/testcase/updatenode/cases1 | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 xCAT-test/autotest/testcase/updatenode/cases1 diff --git a/xCAT-test/autotest/testcase/updatenode/cases1 b/xCAT-test/autotest/testcase/updatenode/cases1 new file mode 100644 index 000000000..fac86011b --- /dev/null +++ b/xCAT-test/autotest/testcase/updatenode/cases1 @@ -0,0 +1,36 @@ +start:updatenode_scripts +cmd:mkdir -p /install/postscripts +check:rc==0 +cmd:echo "#!/bin/bash" >/install/postscripts/blah +cmd:echo "echo FOO BAR BAZ QUX" >>/install/postscripts/blah +cmd:chmod 0755 /install/postscripts/blah +check:rc==0 +cmd:updatenode $$CN -P blah >/tmp/updatenode.blah.out +check:rc==0 +cmd:grep 'FOO BAR BAZ QUX' /tmp/updatenode.blah.out +check:rc==0 +check:rc==0 +cmd:rm -f /install/postscripts/blah /tmp/updatenode.blah.out +check:rc==0 +end + +start:updatenode_scripts_timeout +cmd:mkdir -p /install/postscripts +check:rc==0 +cmd:echo "#!/bin/bash" >/install/postscripts/blah +cmd:echo "echo FOO BAR BAZ QUX" >>/install/postscripts/blah +cmd:echo "sleep 20" >>/install/postscripts/blah +cmd:echo "echo XYZZY ZZZ" >>/install/postscripts/blah +cmd:chmod 0755 /install/postscripts/blah +check:rc==0 +cmd:updatenode $$CN -P blah -t 5 >/tmp/updatenode.blah.out 2>/tmp/updatenode.blah.err +check:rc==0 +cmd:grep 'FOO BAR BAZ QUX' /tmp/updatenode.blah.out +check:rc==0 +cmd:grep 'XYZZY ZZZ' /tmp/updatenode.blah.out +check:rc==1 +cmd:grep 'SIGINT' /tmp/updatenode.blah.err +check:rc==0 +cmd:rm -f /install/postscripts/blah /tmp/updatenode.blah.out /tmp/updatenode.blah.err +check:rc==0 +end From 4f64a00b4bc0819c28e38d938f2de494538d4e56 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Tue, 8 Nov 2016 15:13:54 +0800 Subject: [PATCH 2/2] Fix a minor problem in the test case of updatenode --- xCAT-test/autotest/testcase/updatenode/cases1 | 1 - 1 file changed, 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/updatenode/cases1 b/xCAT-test/autotest/testcase/updatenode/cases1 index fac86011b..cafd28d45 100644 --- a/xCAT-test/autotest/testcase/updatenode/cases1 +++ b/xCAT-test/autotest/testcase/updatenode/cases1 @@ -9,7 +9,6 @@ cmd:updatenode $$CN -P blah >/tmp/updatenode.blah.out check:rc==0 cmd:grep 'FOO BAR BAZ QUX' /tmp/updatenode.blah.out check:rc==0 -check:rc==0 cmd:rm -f /install/postscripts/blah /tmp/updatenode.blah.out check:rc==0 end