diff --git a/scripts/run.sh b/scripts/run.sh index f04227d0..3dc69de5 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -177,8 +177,6 @@ else echo "" echo "use the following command to terminate:" echo "" - echo "pkill -P ${PID}" - echo "kill -2 ${PID}" - echo "pkill -9 -f sqja3uK17MJxfC7AN8nGadBw9JK5BcrsNwNynsqP5Gih8M5Bm" + echo "pkill -P ${PID} && kill -2 ${PID} && pkill -9 -f sqja3uK17MJxfC7AN8nGadBw9JK5BcrsNwNynsqP5Gih8M5Bm" echo "" fi diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 55d0e40f..fe356393 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -281,7 +281,7 @@ var _ = ginkgo.AfterSuite(func() { gomega.Expect(err).Should(gomega.BeNil()) case modeRun: - outf("{{red}}skipping shutting down cluster{{/}}\n") + outf("{{yellow}}skipping shutting down cluster{{/}}\n") } outf("{{red}}shutting down client{{/}}\n") @@ -312,6 +312,12 @@ var _ = ginkgo.Describe("[Network]", func() { }) var _ = ginkgo.Describe("[Claim/SetTx]", func() { + switch mode { + case modeRun: + outf("{{yellow}}skipping ClaimTx and SetTx tests{{/}}\n") + return + } + ginkgo.It("get currently accepted block ID", func() { for _, inst := range instances { cli := inst.cli