From: Éric Araujo <merwok@netwok.org>
Date: Fri, 10 Jun 2011 02:29:43 +0000 (+0200)
Subject: Clean up extra environment variable after packaging tests.
X-Git-Tag: v3.3.0a1~2135^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b612220e4ddaea89058065f98735590b710550d;p=python

Clean up extra environment variable after packaging tests.

packaging.util.check_environ will define HOME and PLAT if they don’t exist; for
some reason, it does not define PLAT when running the tests from a checkout (so
no regrtest warning) but does when running from an installed Python.

Cleaning up the envvar in test_dist fixes the warning on my machine, but I
suspect that a test runner using a different order to run files or running them
in parallel may have PLAT defined in its environment because of another test.
Quite a lot of code ends up calling check_environ; maybe we should just clean
up PLAT in every test.  For now I’m doing this simple fix, we’ll see if we get
bug reports.
---

diff --git a/Lib/packaging/tests/test_dist.py b/Lib/packaging/tests/test_dist.py
index fb6d524fdc..e1c5ff0a2d 100644
--- a/Lib/packaging/tests/test_dist.py
+++ b/Lib/packaging/tests/test_dist.py
@@ -35,7 +35,7 @@ class DistributionTestCase(support.TempdirManager,
                            support.EnvironRestorer,
                            unittest.TestCase):
 
-    restore_environ = ['HOME']
+    restore_environ = ['HOME', 'PLAT']
 
     def setUp(self):
         super(DistributionTestCase, self).setUp()