# [PATCH] t7400: encapsulate setup code in test_expect_success 3 messages from 2018-06-12 to 2018-06-18. Participants: Stefan Beller, Eric Sunshine. Thread: https://gitlist.dev/t/48699 ## Stefan Beller, 2018-06-12 21:25 Subject: [PATCH] t7400: encapsulate setup code in test_expect_success Message-ID: <20180612212540.200142-1-sbeller@google.com> URL: https://gitlist.dev/e/20180612212540.200142-1-sbeller%40google.com ``` When running t7400 in a shell you observe more output than expected: ... ok 8 - setup - hide init subdirectory ok 9 - setup - repository to add submodules to ok 10 - submodule add [master (root-commit) d79ce16] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 one.t ok 11 - redirected submodule add does not show progress ok 12 - redirected submodule add --progress does show progress ok 13 - submodule add to .gitignored path fails ... Fix the output by encapsulating the setup code in test_expect_success Signed-off-by: Stefan Beller --- t/t7400-submodule-basic.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 1a33040d94d..c6e1f749639 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -126,8 +126,10 @@ test_expect_success 'submodule add' ' test_cmp empty untracked ' -test_create_repo parent && -test_commit -C parent one +test_expect_success 'setup parent and one repository for further tests' ' + test_create_repo parent && + test_commit -C parent one +' test_expect_success 'redirected submodule add does not show progress' ' git -C addtest submodule add "file://$submodurl/parent" submod-redirected \ -- 2.18.0.rc1.244.gcf134e6275-goog ``` ## Eric Sunshine, 2018-06-12 21:36 Subject: Re: [PATCH] t7400: encapsulate setup code in test_expect_success Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQM-DXc3sK_Eb7xaaTxNk%3D0yu9Q3oYtx7M4EinS04AYHA%40mail.gmail.com In-Reply-To: <20180612212540.200142-1-sbeller@google.com> ``` On Tue, Jun 12, 2018 at 5:25 PM, Stefan Beller wrote: > When running t7400 in a shell you observe more output than expected: > ... > ok 10 - submodule add > [master (root-commit) d79ce16] one > Author: A U Thor > 1 file changed, 1 insertion(+) > create mode 100644 one.t > ok 11 - redirected submodule add does not show progress > ... > Fix the output by encapsulating the setup code in test_expect_success > > Signed-off-by: Stefan Beller > --- > diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh > @@ -126,8 +126,10 @@ test_expect_success 'submodule add' ' > -test_create_repo parent && > -test_commit -C parent one > +test_expect_success 'setup parent and one repository for further tests' ' Nit: "for further tests" is implied for actions performed by a "setup" function, so a bit redundant to say so. > + test_create_repo parent && > + test_commit -C parent one > +' ``` ## Stefan Beller, 2018-06-18 23:41 Subject: [PATCH] t7400: encapsulate setup code in test_expect_success Message-ID: <20180618234148.205439-1-sbeller@google.com> URL: https://gitlist.dev/e/20180618234148.205439-1-sbeller%40google.com In-Reply-To: ``` When running t7400 in a shell you observe more output than expected: ... ok 8 - setup - hide init subdirectory ok 9 - setup - repository to add submodules to ok 10 - submodule add [master (root-commit) d79ce16] one Author: A U Thor 1 file changed, 1 insertion(+) create mode 100644 one.t ok 11 - redirected submodule add does not show progress ok 12 - redirected submodule add --progress does show progress ok 13 - submodule add to .gitignored path fails ... Fix the output by encapsulating the setup code in test_expect_success Signed-off-by: Stefan Beller --- t/t7400-submodule-basic.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 2f532529b82..812db137b8d 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -126,8 +126,10 @@ test_expect_success 'submodule add' ' test_cmp empty untracked ' -test_create_repo parent && -test_commit -C parent one +test_expect_success 'setup parent and one repository' ' + test_create_repo parent && + test_commit -C parent one +' test_expect_success 'redirected submodule add does not show progress' ' git -C addtest submodule add "file://$submodurl/parent" submod-redirected \ -- 2.18.0.rc1.244.gcf134e6275-goog ```