|
@ -1317,8 +1317,8 @@ expected="docker-compose run -T web_site" |
|
|
|
|
|
|
|
|
cd "$test_tmpdir" |
|
|
cd "$test_tmpdir" |
|
|
|
|
|
|
|
|
out=\$("$tprog" --dry-compose-run logs -ft web_site 2>&1 >/dev/null) |
|
|
|
|
|
expected="docker-compose logs -f -t web_site" |
|
|
|
|
|
|
|
|
out=\$("$tprog" --dry-compose-run logs -ft --tail 20 web_site 2>&1 >/dev/null) |
|
|
|
|
|
expected="docker-compose logs -f -t --tail 20 web_site" |
|
|
|
|
|
|
|
|
[ "\$out" == "\$expected" ] || { |
|
|
[ "\$out" == "\$expected" ] || { |
|
|
echo -e "DIFF:\n\$(diff <(echo "\$out") <(echo "\$expected"))" |
|
|
echo -e "DIFF:\n\$(diff <(echo "\$out") <(echo "\$expected"))" |
|
@ -1380,8 +1380,8 @@ expected_reg="Unknown option '-Z'" |
|
|
|
|
|
|
|
|
cd "$test_tmpdir" |
|
|
cd "$test_tmpdir" |
|
|
|
|
|
|
|
|
out=\$("$tprog" --dry-compose-run logs web_site mysql 2>&1 >/dev/null) |
|
|
|
|
|
expected="docker-compose logs web_site mysql" |
|
|
|
|
|
|
|
|
out=\$("$tprog" --dry-compose-run logs --tail 15 web_site mysql 2>&1 >/dev/null) |
|
|
|
|
|
expected="docker-compose logs --tail 15 web_site mysql" |
|
|
|
|
|
|
|
|
[ "\$out" == "\$expected" ] || { |
|
|
[ "\$out" == "\$expected" ] || { |
|
|
echo -e "DIFF:\n\$(diff <(echo "\$out") <(echo "\$expected"))" |
|
|
echo -e "DIFF:\n\$(diff <(echo "\$out") <(echo "\$expected"))" |
|
|