diff options
author | Emil Melnikov <emilmelnikov@users.noreply.github.com> | 2019-03-06 15:54:51 +0100 |
---|---|---|
committer | Timothy Crosley <timothy.crosley@gmail.com> | 2019-03-06 19:08:51 -0800 |
commit | be50253e0beaadc4412ddb63091c1574a8507680 (patch) | |
tree | e21178b70cff08915d83ae184a63eb253ecae2ac | |
parent | 138a4a1fb16cdabee09450df5ffdb6096d9fb7e2 (diff) | |
download | isort-be50253e0beaadc4412ddb63091c1574a8507680.tar.gz |
Merge in fix for quiet mode
-rw-r--r-- | isort/isort.py | 3 | ||||
-rw-r--r-- | test_isort.py | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/isort/isort.py b/isort/isort.py index dc5cc7a6..7b054edf 100644 --- a/isort/isort.py +++ b/isort/isort.py @@ -219,7 +219,8 @@ class SortImports(object): if answer in ('quit', 'q'): sys.exit(1) with io.open(self.file_path, encoding=self.file_encoding, mode='w', newline='') as output_file: - print("Fixing {0}".format(self.file_path)) + if not self.config['quiet']: + print("Fixing {0}".format(self.file_path)) output_file.write(self.output) @property diff --git a/test_isort.py b/test_isort.py index 6f2feeb8..a93ea366 100644 --- a/test_isort.py +++ b/test_isort.py @@ -2737,6 +2737,22 @@ def test_command_line(tmpdir, capfd, multiprocess): assert str(tmpdir.join("file2.py")) in out +@pytest.mark.parametrize("quiet", (False, True)) +def test_quiet(tmpdir, capfd, quiet): + if sys.platform.startswith("win"): + return + from isort.main import main + tmpdir.join("file1.py").write("import re\nimport os") + tmpdir.join("file2.py").write("") + arguments = ["-rc", str(tmpdir)] + if quiet: + arguments.append("-q") + main(arguments) + out, err = capfd.readouterr() + assert not err + assert bool(out) != quiet + + @pytest.mark.parametrize('enabled', (False, True)) def test_safety_excludes(tmpdir, enabled): tmpdir.join("victim.py").write("# ...") |