Fix 'pkill not found' in docker container

magik6k · magik6k · commit 9c4cb696bbd1 · 2017-06-26T02:04:09.000+02:00
diff --git a/sharness/Makefile b/sharness/Makefile
@@ -48,7 +48,7 @@ clean-test-results:
 
 $(T): clean-test-results deps
 	@echo "*** $@ ***"
-	./$@
+	./$@ -v
 
 aggregate: clean-test-results $(T)
 	@echo "*** $@ ***"
diff --git a/sharness/lib/test-lib.sh b/sharness/lib/test-lib.sh
@@ -129,7 +129,7 @@ test_start_daemon() {
 test_stop_daemon() {
 	docid="$1"
 	test_expect_success "kill ipfs daemon" '
-		exec_docker "$docid" "pkill ipfs"
+		exec_docker "$docid" "kill $(pidof ipfs)"
 	'
 }
 

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ test_start_daemon() {`
`129`	`129`	`test_stop_daemon() {`
`130`	`130`	`docid="$1"`
`131`	`131`	`test_expect_success "kill ipfs daemon" '`
`132`		`- exec_docker "$docid" "pkill ipfs"`
	`132`	`+ exec_docker "$docid" "kill $(pidof ipfs)"`
`133`	`133`	`'`
`134`	`134`	`}`
`135`	`135`