Merge "Ensure shell tests use isolated env variables set"
This commit is contained in:
commit
593adf229a
@ -20,10 +20,8 @@ FAKE_ENV = {'OS_USERNAME': 'username',
|
|||||||
class ShellTest(utils.TestCase):
|
class ShellTest(utils.TestCase):
|
||||||
|
|
||||||
def make_env(self, exclude=None):
|
def make_env(self, exclude=None):
|
||||||
for var, val in FAKE_ENV.items():
|
env = dict((k, v) for k, v in FAKE_ENV.items() if k != exclude)
|
||||||
if var == exclude:
|
self.useFixture(fixtures.MonkeyPatch('os.environ', env))
|
||||||
continue
|
|
||||||
self.useFixture(fixtures.EnvironmentVariable(var, val))
|
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(ShellTest, self).setUp()
|
super(ShellTest, self).setUp()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user