Moved env vars tests to class.

bonobo/examples/environment/env_vars/get_passed_env.py

@@ -4,9 +4,9 @@ import bonobo
 
 
 def extract():
-    env_test_user = os.getenv('ENV_TEST_USER')
+    env_test_user = os.getenv('ENV_TEST_USER', 'user')
-    env_test_number = os.getenv('ENV_TEST_NUMBER')
+    env_test_number = os.getenv('ENV_TEST_NUMBER', 'number')
-    env_test_string = os.getenv('ENV_TEST_STRING')
+    env_test_string = os.getenv('ENV_TEST_STRING', 'string')
     return env_test_user, env_test_number, env_test_string
 
 

tests/test_commands.py

@@ -229,7 +229,20 @@ def test_run_file_with_default_env_file_and_env_file_and_env_vars(runner, capsys
 
 
 @all_runners
-def test_run_file_with_env_vars(runner, capsys):
+class TestEnvVars(object):
+    def test_run_file_with_env_var(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_vars/get_passed_env.py'),
+            '--env', 'ENV_TEST_NUMBER=123'
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] != 'test_user'
+        assert out[1] == '123'
+        assert out[2] == 'string'
+
+    def test_run_file_with_env_vars(self, runner, capsys):
         runner(
             'run', '--quiet',
             get_examples_path('environment/env_vars/get_passed_env.py'),
@@ -242,9 +255,19 @@ def test_run_file_with_env_vars(runner, capsys):
         assert out[1] == '123'
         assert out[2] == 'my_test_string'
 
+    def test_run_module_with_env_var(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_vars.get_passed_env',
+            '--env', 'ENV_TEST_NUMBER=123'
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        assert out[1] == '123'
+        assert out[2] == 'my_test_string'
 
-@all_runners
+    def test_run_module_with_env_vars(self, runner, capsys):
-def test_run_module_with_env_vars(runner, capsys):
         runner(
             'run', '--quiet', '-m',
             'bonobo.examples.environment.env_vars.get_passed_env',