On Fri, Jun 13, 2014 at 02:59:42AM -0400, Jeff King wrote: > On Thu, Jun 12, 2014 at 02:39:01PM -0500, Caleb Thompson wrote: > > > t/t7507-commit-verbose.sh was using a global test_set_editor call to > > build its environment. > > > > Improve robustness against global state changes by having only tests > > which intend to use the $EDITOR to check for presence of a diff in the > > editor set up the test-editor to use check-for-diff rather than relying > > upon the editor set once at script start. > > This implies to me that EDITOR is unset after leaving these tests. I > don't think that is how it works, though. The tests themselves run in > the main environment of the test script. A call to test_set_editor from > one of them will still affect the other tests. > > I think it works anyway because every subsequent test that cares > actually sets the editor itself. > > Or did you just mean that the new rule is "every test sets the editor as > they need", which means that we do not have to worry anymore about > polluting the environment for other tests?
That's exactly what I meant. We can stop relying on the global state *as it is initially set* and instead move the setup into the tests which rely on it. > > -Peff > >  It might make sense for test_set_editor, when run from within a > test, to behave more like test_config, and do: > > test_when_finished ' > sane_unset FAKE_EDITOR && > sane_unset EDITOR > ' It might, but it's a little out of scope in addition to your concern about other test scripts. > > I don't know if there would be fallouts with other test scripts, > though. How is this for a reword of that commit description: t/t7507-commit-verbose.sh was using a global test_set_editor call to build its environment. The $EDITOR being used was not necessary for all tests, and was in fact circumvented using subshells in some cases. To improve robustness against global state changes and avoid the use of subshells to temporarily switch the editor, set the editor explicitly wherever it will be important. Specifically, in tests that need to check for the presence of a diff in the editor, make calls to set_test_editor to set $EDITOR to check-for-diff rather than relying on that editor being configured globally. This also helps readers grok the tests as the setup is closer to the verification. Caleb Thompson
Description: PGP signature