diff options
| -rwxr-xr-x | cmd2/cmd2.py | 3 | ||||
| -rwxr-xr-x | tests/test_cmd2.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index a0df0b00..9d29418b 100755 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -3790,9 +3790,8 @@ class Cmd(cmd.Cmd): self.perror("'{}' is not a file".format(expanded_path)) return - # Make sure the file is not empty + # An empty file is not an error, so just return if os.path.getsize(expanded_path) == 0: - self.perror("'{}' is empty".format(expanded_path)) return # Make sure the file is ASCII or UTF-8 encoded text diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index a856c1d6..313b4dee 100755 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -318,7 +318,7 @@ def test_run_script_with_empty_file(base_app, request): test_dir = os.path.dirname(request.module.__file__) filename = os.path.join(test_dir, 'scripts', 'empty.txt') out, err = run_cmd(base_app, 'run_script {}'.format(filename)) - assert "is empty" in err[0] + assert not out and not err def test_run_script_with_binary_file(base_app, request): test_dir = os.path.dirname(request.module.__file__) |