summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Edmund Crosley <timothy.crosley@gmail.com>2020-10-04 15:29:24 -0700
committerGitHub <noreply@github.com>2020-10-04 15:29:24 -0700
commit6c6fb4109c0fbf67eaa3441af8c2b82df8e8174d (patch)
tree4a68961d6d7aef5c0e51026417362e86d151f8e6
parent7aa7d1f603301c7fae7bf6a7839b00b5c6b75d6f (diff)
parent4045450a106405e97fc71e0ea4b0852ddeb299bb (diff)
downloadisort-6c6fb4109c0fbf67eaa3441af8c2b82df8e8174d.tar.gz
Merge pull request #1524 from anirudnits/correcting_misplaced_test_for_only_modified_with_stdin
Corrected a misplaced test and added another.
-rw-r--r--tests/unit/test_main.py49
1 files changed, 33 insertions, 16 deletions
diff --git a/tests/unit/test_main.py b/tests/unit/test_main.py
index 3fb75ed6..caf20e7e 100644
--- a/tests/unit/test_main.py
+++ b/tests/unit/test_main.py
@@ -722,6 +722,22 @@ import sys
"""
)
+ # ensures that only-modified flag works with stdin
+ input_content = TextIOWrapper(
+ BytesIO(
+ b"""
+import a
+import b
+"""
+ )
+ )
+
+ main.main(["-", "--verbose", "--only-modified"], stdin=input_content)
+ out, error = capsys.readouterr()
+
+ assert "else-type place_module for a returned THIRDPARTY" not in out
+ assert "else-type place_module for b returned THIRDPARTY" not in out
+
def test_unsupported_encodings(tmpdir, capsys):
tmp_file = tmpdir.join("file.py")
@@ -752,22 +768,6 @@ __revision__ = 'יייי'
main.main([str(tmp_file), str(normal_file), "--verbose"])
out, error = capsys.readouterr()
- # ensures that only-modified flag works with stdin
- input_content = TextIOWrapper(
- BytesIO(
- b"""
-import a
-import b
-"""
- )
- )
-
- main.main(["-", "--verbose", "--only-modified"], stdin=input_content)
- out, error = capsys.readouterr()
-
- assert "else-type place_module for a returned THIRDPARTY" not in out
- assert "else-type place_module for b returned THIRDPARTY" not in out
-
def test_only_modified_flag(tmpdir, capsys):
# ensures there is no verbose output for correct files with only-modified flag
@@ -852,3 +852,20 @@ import os
)
assert not error
+
+ file4 = tmpdir.join("file4.py")
+ file4.write(
+ """
+import sys
+import os
+"""
+ )
+
+ with pytest.raises(SystemExit):
+ main.main([str(file2), str(file4), "--check-only", "--verbose", "--only-modified"])
+ out, error = capsys.readouterr()
+
+ assert "else-type place_module for sys returned STDLIB" in out
+ assert "else-type place_module for os returned STDLIB" in out
+ assert "else-type place_module for math returned STDLIB" not in out
+ assert "else-type place_module for pandas returned THIRDPARTY" not in out