[MERGE] Restore environment variables in a timely fashion (bug 124153)

[Andrew Bennetts]

Andrew Bennetts has voted +0.
Status is now: Waiting
Comment:
I see you've already dealt with my comment on the list about using 
osutils.set_or_unset_env, but I still feel like this is still leaving a 
bigger problem untouched (and effectively hiding it by fixing this 
symptom of it).

On the other hand, test infrastructure in general ought to be in the 
habit of restore state that it changes, and this is a minor incremental 
improvement towards that.  So I'm +0 at the moment.  If wasn't so 
uncomfortable about ignoring the 
disable_test_log(enable_test_log(some_file)) bug you've discovered I'd 
probably upgrade my vote.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cd06a5cd30707082229w464d0aecjc5601364a98cba%40mail.gmail.com%3E