On Tue, Nov 22, 2022 at 11:52 AM Rudy Rigot <rudy.rigot@xxxxxxxxx> wrote: > > you might write the commit message like this > > The current phrasing was initially copied as is from a past review > feedback; I have no issues at all replacing it with yours. Apparently, I overlooked that when scanning backward through the thread. > > So, if there is an existing test script in which > > these new tests might fit, it's better to add them to that script > > instead > > Oh, sorry about that, it hadn't occurred to me that there could be a > downside to using new test script numbers. No need to apologize. Reviewers understand that there is a lot to absorb and figure out. > I'm 100% on board with the thinking, but I'm struggling quite a bit to > implement it. There are several existing test scripts where these new > tests would fit very well semantically (t7060-wtstatus.sh,c, > t7512-status-help.sh, t7519-status-fsmonitor.sh, ...), and I spent > quite some time yesterday trying to move the 3 news tests to those. > For some reason, test_cmp is not giving me a diff anymore when working > in those script files, so I feel in the dark about what the tests are > failing about, and I'm stumped about what to try next. > > Here is a gist https://gist.github.com/rudyrigot/b31fcb6384e829ca7586818758e48d0b, > with: > > - the patch as I currently have it on t7508-status.sh (it's a bit > longer than it was, without the isolation in a separate script I've > had to do a few things to mitigate the side effects from other tests > in the script) I probably should have thought to warn about possible interaction with earlier tests when I made the suggestion to place the tests in an existing script. Nevertheless, we should be able to sidestep all that "isolation goop" you had to add to the tests... (more below). > - the end of what I get when running 'sh ./t7508-status.sh -v': > https://gist.github.com/rudyrigot/ee80f3d59231f25698c9dd6c48d8ab85. It > seems like 2 of my 3 tests are failing, but the output isn't very > helpful to figure out why. > > Would you (or someone else) have pointers to help me get through this one? The second 'gist' URL seems broken, so I can't comment on the exact output. Without having seen the actual problem, I can't really provide direct feedback for fixing the precise issue, however... We actually don't want you to pollute your new tests with goop to clean up after earlier tests in the script since that just introduces a bunch of code in your tests which is not directly relevant to what your tests are checking. So, perhaps the cleanest way to approach this is to have your "setup" test create a new repository in the trash directory and then just run your remaining new tests in that repository. That way, your tests don't have to deal with any gunk from earlier tests. This basically means taking your tests pretty much as you had them in v6, but with a little extra boilerplate. Something like this: test_expect_success setup ' git init slowstatus && ( cd slowstatus && cat >.gitignore <<-\EOF && /actual /expected /out EOF git add .gitignore && git commit -m "Add .gitignore" ) ' test_expect_success 'when core.untrackedCache and fsmonitor are unset' ' ( cd slowstatus && test_unconfig core.untrackedCache && test_unconfig core.fsmonitor && ... ) ' and so on. > I'm tempted to throw in the towel, since it sounded like it wasn't too > huge a deal if this lived in its separate script file, and that other > people's bandwidth (which I'm aware is what I'm requesting here) is an > even more scarce resource. My comment about possibly leaving them in a separate script if you couldn't find a suitable existing script was just general advice. I can't speak for Junio and thus can't say what he will or will not accept in his tree. > So I'll submit a new patch with everything > else but this, so there's the option to still proceed with it if > that's the most sensible path forward. But I have to admit I'm quite > frustrated that I couldn't figure this last one out by myself, so I'm > more than happy to dig more into it, if anyone has guidance. Perhaps the suggestion I outlined above will help.
