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

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

[Johannes Schindelin via GitGitGadget]

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(-)

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

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

[Derrick Stolee]

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!

LGTM.
-Stolee

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

[Taylor Blau]

On Thu, Nov 10, 2022 at 08:56:41AM -0500, Derrick Stolee wrote:
> 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