From 757cb0cf236cd754a3ae788b2d67bdf1942ca42e Mon Sep 17 00:00:00 2001 From: James Shubin Date: Sun, 26 Feb 2017 20:44:01 -0500 Subject: [PATCH] test: Small fixups to t4 and a rename --- test/shell/graph-fanin-1.sh | 7 +++++++ test/shell/{t4.yaml => graph-fanin-1.yaml} | 2 +- test/shell/t4.sh | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100755 test/shell/graph-fanin-1.sh rename test/shell/{t4.yaml => graph-fanin-1.yaml} (94%) delete mode 100755 test/shell/t4.sh diff --git a/test/shell/graph-fanin-1.sh b/test/shell/graph-fanin-1.sh new file mode 100755 index 00000000..6a9849c4 --- /dev/null +++ b/test/shell/graph-fanin-1.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e + +# should take slightly more than 25s, but fail if we take 35s) +$timeout --kill-after=35s 30s ./mgmt run --yaml graph-fanin-1.yaml --converged-timeout=5 --no-watch --tmp-prefix --no-pgp & +pid=$! +wait $pid # get exit status +exit $? diff --git a/test/shell/t4.yaml b/test/shell/graph-fanin-1.yaml similarity index 94% rename from test/shell/t4.yaml rename to test/shell/graph-fanin-1.yaml index 9fe6bb0b..0e195493 100644 --- a/test/shell/t4.yaml +++ b/test/shell/graph-fanin-1.yaml @@ -1,6 +1,6 @@ --- graph: mygraph -comment: simple exec fan in example to demonstrate optimization) +comment: simple exec fan in example to demonstrate optimization resources: exec: - name: exec1 diff --git a/test/shell/t4.sh b/test/shell/t4.sh deleted file mode 100755 index 6eeb832d..00000000 --- a/test/shell/t4.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -# should take slightly more than 25s, but fail if we take 35s) -$timeout --kill-after=35s 30s ./mgmt run --yaml t4.yaml --converged-timeout=5 --no-watch --tmp-prefix & -pid=$! -wait $pid # get exit status -exit $?