Merge pull request #1179 from mrjana/bugs

aboch · aboch · commit a0e5f1d41b59 · 2016-05-17T14:36:14.000-07:00
Fix flakiness in dnet_exec
diff --git a/test/integration/dnet/helpers.bash b/test/integration/dnet/helpers.bash
@@ -254,7 +254,7 @@ function dnet_cmd() {
 }
 
 function dnet_exec() {
-    docker exec -it ${1} bash -c "$2"
+    docker exec -it ${1} bash -c "trap \"echo SIGHUP\" SIGHUP; $2"
 }
 
 function runc() {

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ function dnet_cmd() {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`function dnet_exec() {`
`257`		`- docker exec -it ${1} bash -c "$2"`
	`257`	`+ docker exec -it ${1} bash -c "trap \"echo SIGHUP\" SIGHUP; $2"`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`function runc() {`