Merge branch 'develop' of github.com:python-bonobo/bonobo into develop

tests/config/test_configurables.py

@@ -67,7 +67,7 @@ def test_defaults():
 
     assert o.required_str == 'hello'
     assert o.default_str == 'foo'
-    assert o.integer == None
+    assert o.integer is None
 
 
 def test_str_type_factory():
@@ -78,7 +78,7 @@ def test_str_type_factory():
 
     assert o.required_str == '42'
     assert o.default_str == 'foo'
-    assert o.integer == None
+    assert o.integer is None
 
 
 def test_int_type_factory():
@@ -100,8 +100,8 @@ def test_bool_type_factory():
 
     assert o.required_str == 'yes'
     assert o.default_str == 'foo'
-    assert o.integer == None
-    assert o.also_required == True
+    assert o.integer is None
+    assert o.also_required is True
 
 
 def test_option_resolution_order():
@@ -112,7 +112,7 @@ def test_option_resolution_order():
 
     assert o.required_str == 'kaboom'
     assert o.default_str == 'foo'
-    assert o.integer == None
+    assert o.integer is None
 
 
 def test_option_positional():

tests/test_commands.py

@@ -103,27 +103,238 @@ def test_version(runner, capsys):
 
 
 @all_runners
-def test_run_with_env(runner, capsys):
-    runner(
-        'run', '--quiet',
-        get_examples_path('env_vars/get_passed_env.py'), '--env', 'ENV_TEST_NUMBER=123', '--env',
-        'ENV_TEST_USER=cwandrews', '--env', "ENV_TEST_STRING='my_test_string'"
-    )
-    out, err = capsys.readouterr()
-    out = out.split('\n')
-    assert out[0] == 'cwandrews'
-    assert out[1] == '123'
-    assert out[2] == 'my_test_string'
+class TestDefaultEnvFile(object):
+    def test_run_file_with_default_env_file(self, runner, capsys):
+        runner(
+            'run', '--quiet', '--default-env-file', '.env_one',
+            get_examples_path('environment/env_files/get_passed_env_file.py')
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] != 'marzo'
+
+    def test_run_file_with_multiple_default_env_files(self, runner, capsys):
+        runner(
+            'run', '--quiet', '--default-env-file', '.env_one',
+            '--default-env-file', '.env_two',
+            get_examples_path('environment/env_files/get_passed_env_file.py')
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] != 'marzo'
+
+    def test_run_module_with_default_env_file(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_files.get_passed_env_file',
+            '--default-env-file', '.env_one'
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] != 'marzo'
+
+    def test_run_module_with_multiple_default_env_files(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_files.get_passed_env_file',
+            '--default-env-file', '.env_one', '--default-env-file', '.env_two',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] != 'marzo'
 
 
 @all_runners
-def test_run_module_with_env(runner, capsys):
-    runner(
-        'run', '--quiet', '-m', 'bonobo.examples.env_vars.get_passed_env', '--env', 'ENV_TEST_NUMBER=123', '--env',
-        'ENV_TEST_USER=cwandrews', '--env', "ENV_TEST_STRING='my_test_string'"
-    )
-    out, err = capsys.readouterr()
-    out = out.split('\n')
-    assert out[0] == 'cwandrews'
-    assert out[1] == '123'
-    assert out[2] == 'my_test_string'
+class TestEnvFile(object):
+    def test_run_file_with_file(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_files/get_passed_env_file.py'),
+            '--env-file', '.env_one',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] == 'marzo'
+
+    def test_run_file_with_multiple_files(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_files/get_passed_env_file.py'),
+            '--env-file', '.env_one', '--env-file', '.env_two',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'not_sweet_password'
+        assert out[2] == 'abril'
+
+    def test_run_module_with_file(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_files.get_passed_env_file',
+            '--env-file', '.env_one',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'sweetpassword'
+        assert out[2] == 'marzo'
+
+    def test_run_module_with_multiple_files(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_files.get_passed_env_file',
+            '--env-file', '.env_one', '--env-file', '.env_two',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'not_sweet_password'
+        assert out[2] == 'abril'
+
+
+@all_runners
+class TestEnvFileCombinations(object):
+    def test_run_file_with_default_env_file_and_env_file(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_files/get_passed_env_file.py'),
+            '--default-env-file', '.env_one', '--env-file', '.env_two',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '321'
+        assert out[1] == 'not_sweet_password'
+        assert out[2] == 'abril'
+
+    def test_run_file_with_default_env_file_and_env_file_and_env_vars(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_files/get_passed_env_file.py'),
+            '--default-env-file', '.env_one', '--env-file', '.env_two',
+            '--env', 'TEST_USER_PASSWORD=SWEETpassWORD', '--env',
+            'MY_SECRET=444',
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == '444'
+        assert out[1] == 'SWEETpassWORD'
+        assert out[2] == 'abril'
+
+
+@all_runners
+class TestDefaultEnvVars(object):
+    def test_run_file_with_default_env_var(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_vars/get_passed_env.py'),
+            '--default-env', 'USER=clowncity', '--env', 'USER=ted'
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'user'
+        assert out[1] == 'number'
+        assert out[2] == 'string'
+        assert out[3] != 'clowncity'
+
+    def test_run_file_with_default_env_vars(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_vars/get_passed_env.py'),
+            '--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
+            '--default-env', "ENV_TEST_STRING='my_test_string'"
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        assert out[1] == '123'
+        assert out[2] == 'my_test_string'
+
+    def test_run_module_with_default_env_var(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_vars.get_passed_env',
+            '--env', 'ENV_TEST_NUMBER=123',
+            '--default-env', 'ENV_TEST_STRING=string'
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        assert out[1] == '123'
+        assert out[2] != 'string'
+
+    def test_run_module_with_default_env_vars(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_vars.get_passed_env',
+            '--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
+            '--default-env', "ENV_TEST_STRING='string'"
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        assert out[1] == '123'
+        assert out[2] != 'string'
+
+
+@all_runners
+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] == 'my_test_string'
+
+    def test_run_file_with_env_vars(self, runner, capsys):
+        runner(
+            'run', '--quiet',
+            get_examples_path('environment/env_vars/get_passed_env.py'),
+            '--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
+            '--env', "ENV_TEST_STRING='my_test_string'"
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        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'
+
+    def test_run_module_with_env_vars(self, runner, capsys):
+        runner(
+            'run', '--quiet', '-m',
+            'bonobo.examples.environment.env_vars.get_passed_env',
+            '--env', 'ENV_TEST_NUMBER=123', '--env', 'ENV_TEST_USER=cwandrews',
+            '--env', "ENV_TEST_STRING='my_test_string'"
+        )
+        out, err = capsys.readouterr()
+        out = out.split('\n')
+        assert out[0] == 'cwandrews'
+        assert out[1] == '123'
+        assert out[2] == 'my_test_string'

tests/test_settings.py

@@ -42,9 +42,9 @@ def test_setting():
 def test_default_settings():
     settings.clear_all()
 
-    assert settings.DEBUG.get() == False
-    assert settings.PROFILE.get() == False
-    assert settings.QUIET.get() == False
+    assert settings.DEBUG.get() is False
+    assert settings.PROFILE.get() is False
+    assert settings.QUIET.get() is False
     assert settings.LOGGING_LEVEL.get() == logging._checkLevel('INFO')
 
     with patch.dict(environ, {'DEBUG': 't'}):

tests/util/test_iterators.py

@@ -18,5 +18,5 @@ def test_force_iterator_with_generator():
         yield 'ccc'
 
     iterator = force_iterator(generator())
-    assert type(iterator) == types.GeneratorType
+    assert isinstance(iterator, types.GeneratorType)
     assert list(iterator) == ['aaa', 'bbb', 'ccc']