From c57ab7ba9d7e25ac18d1e9883d3fc86a688fa7be Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 4 Mar 2012 02:28:06 +0100 Subject: selftest.target: Add tests for setup. --- selftest/target/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'selftest/target/__init__.py') diff --git a/selftest/target/__init__.py b/selftest/target/__init__.py index 03a440dd27..ac2cc19a48 100644 --- a/selftest/target/__init__.py +++ b/selftest/target/__init__.py @@ -91,13 +91,15 @@ class EnvironmentManager(object): def get_running_env(self, name): envname = name.split(":")[0] - return self.running_envs[envname] + if envname == "none": + return NoneEnvironment() + return self.running_envs.get(envname) def getlog_env(self, envname): env = self.get_running_env(envname) return env.get_log() - def check_env(envname): + def check_env(self, envname): """Check if an environment is still up. :param envname: Environment to check @@ -115,13 +117,11 @@ class EnvironmentManager(object): del self.running_envs[envname] def teardown_all(self): + """Teardown all environments.""" for env in self.running_envs.iterkeys(): self.teardown_env(env) def setup_env(self, envname, prefix): - if envname == "none": - return NoneEnvironment() - running_env = self.get_running_env(envname) if running_env is not None: if not running_env.check(): -- cgit