threads / patch / 58782

patchtests(scalar): tighten the stale `scalar.repo` test some

Subject: [PATCH] tests(scalar): tighten the stale `scalar.repo` test some

## tl;dr

3 messages between Nov 10, 2022 and Nov 11, 2022. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Johannes Schindelin via GitGitGadget· Nov 10, 2022, 07:28 UTC · lore

From: Johannes Schindelin <johannes.schindelin@gmx.de>

As pointed out by Stolee, the previous incarnation of this test case was not stringent enough: we want to verify that _only_ the stale entries are removed (previously, the test case would have succeeded even if all entries had been removed).

Let's rectify this and verify that the other entries are left intact.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
    tests(scalar): tighten the stale scalar.repo test some
    
    A follow-up for a topic already in next.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1415%2Fdscho%2Ftighten-stale-scalar.repos-test-case-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1415/dscho/tighten-stale-scalar.repos-test-case-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1415

 t/t9210-scalar.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Show changes to t/t9210-scalar.sh +4 −1

diff --git a/t/t9210-scalar.sh b/t/t9210-scalar.sh
index c7f8a379108..25f500cf682 100755
--- a/t/t9210-scalar.sh
+++ b/t/t9210-scalar.sh
@@ -171,10 +171,13 @@ test_expect_success '`reconfigure -a` removes stale config entries' '
 	scalar register stale &&
 	scalar list >scalar.repos &&
 	grep stale scalar.repos &&
+
+	grep -v stale scalar.repos >expect &&
+
 	rm -rf stale &&
 	scalar reconfigure -a &&
 	scalar list >scalar.repos &&
-	! grep stale scalar.repos
+	test_cmp expect scalar.repos
 '
 
 test_expect_success 'scalar delete without enlistment shows a usage' '

base-commit: c90db53d203d7ade1dc7abe63857cfb5616fe34f

-- 
gitgitgadget

Derrick Stolee· Nov 10, 2022, 13:56 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH] tests(scalar): tighten the stale `scalar.repo` test some

On 11/10/2022 2:28 AM, Johannes Schindelin via GitGitGadget wrote:

Show 6 quoted lines

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> As pointed out by Stolee, the previous incarnation of this test case was
> not stringent enough: we want to verify that _only_ the stale entries
> are removed (previously, the test case would have succeeded even if all
> entries had been removed).

Thanks for tightening the test!

LGTM. -Stolee

Taylor Blau· Nov 11, 2022, 22:25 UTC · re: Derrick Stolee · lore

Re: [PATCH] tests(scalar): tighten the stale `scalar.repo` test some

On Thu, Nov 10, 2022 at 08:56:41AM -0500, Derrick Stolee wrote:

Show 9 quoted lines

> On 11/10/2022 2:28 AM, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > As pointed out by Stolee, the previous incarnation of this test case was
> > not stringent enough: we want to verify that _only_ the stale entries
> > are removed (previously, the test case would have succeeded even if all
> > entries had been removed).
>
> Thanks for tightening the test!

Thanks, both. I merged this back into 'js/remove-stale-scalar-repos' and will re-merge it back into 'next' during the next push-out (probably on Monday or Tuesday of next week).

Thanks, Taylor