Merge lp:~cr3/checkbox/environment_plugin into lp:checkbox

[Marc Tardif]

Merged changes to environment_info for environment to take precedence over configuration files by cr3.

As discussed, enabling the environment to take precedence over configuration files.

[Daniel Manrique (roadmr)]

Looks OK and the code looks quite simpler. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-10 13:45:53 +0000
+++ debian/changelog	2012-10-11 14:23:26 +0000
@@ -2,6 +2,10 @@
 
   * Increased version number after final Ubuntu Quantal release.
 
+  [Marc Tardif]
+  * plugins/environment_info.py: Enabling environment to take precedence
+    over configuration files.
+
  -- Daniel Manrique <[e-mail]>  Wed, 10 Oct 2012 09:45:08 -0400
 
 checkbox (0.14.6) quantal; urgency=low

=== modified file 'plugins/environment_info.py'
--- plugins/environment_info.py	2012-09-20 16:56:31 +0000
+++ plugins/environment_info.py	2012-10-11 14:23:26 +0000
@@ -21,6 +21,8 @@
 
 from checkbox.plugin import Plugin
 from checkbox.properties import String
+from checkbox.variables import get_variables
+
 
 class EnvironmentInfo(Plugin):
 
@@ -42,18 +44,10 @@
         self._manager.reactor.call_on("prompt-begin", self.prompt_begin, 100)
 
     def prompt_begin(self, interface):
-        os.environ['ROUTERS'] = self.routers
-
-        os.environ['ROUTER_SSID'] = self.router_ssid
-        os.environ['ROUTER_PSK'] = self.router_psk
-
-        os.environ['WPA_BG_SSID'] = self.wpa_bg_ssid
-        os.environ['WPA_BG_PSK'] = self.wpa_bg_psk
-        os.environ['OPEN_BG_SSID'] = self.open_bg_ssid
-        os.environ['WPA_N_SSID'] = self.wpa_bg_ssid
-        os.environ['WPA_N_PSK'] = self.wpa_bg_psk
-        os.environ['OPEN_N_SSID'] = self.open_n_ssid
-
-        os.environ['BTDEVADDR'] = self.btdevaddr
+        for key, value in get_variables(self).items():
+            name = key.name.upper()
+            if name not in os.environ:
+                os.environ[name] = value.get()
+
 
 factory = EnvironmentInfo