yetangitu/photo-python
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Perform user expansion when uploading files from the CLI.

Browse source 
Don't ignore missing files - allow an exception to be raised.
Add extra CLI file upload unit tests.
This commit is contained in:
sneakypete81 2013-12-07 17:05:28 +00:00
parent 4deceb6e8e
commit b7fe17656b
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tests/unit/test_cli.py
View file

@ -1,6 +1,7 @@
from __future__ import unicode_literals
import os
import sys
import shutil
import mock
try:
import StringIO as io # Python2
@ -77,6 +78,35 @@ class TestCli(unittest.TestCase):
self.assertEqual(list(files.keys()), ["photo"])
self.assertEqual(files["photo"].name, self.test_file)
@mock.patch.object(trovebox.main.trovebox, "Trovebox")
@mock.patch('sys.stdout', new_callable=io.StringIO)
def test_post_files_with_user_expansion(self, _, mock_trovebox):
"""
Check that files are posted correctly when specified relative
to the '~' user directory
"""
post = mock_trovebox.return_value.post
user_file = "~/.trovebox_temporary_file"
expanded_file = os.path.expanduser(user_file)
shutil.copy(self.test_file, expanded_file)
try:
main(["-X", "POST", "-F", "photo=@%s" % user_file])
# It's not possible to directly compare the file object,
# so check it manually
files = post.call_args[1]["files"]
self.assertEqual(list(files.keys()), ["photo"])
self.assertEqual(files["photo"].name, expanded_file)
finally:
os.remove(expanded_file)
@mock.patch.object(trovebox.main.trovebox, "Trovebox")
@mock.patch('sys.stdout', new_callable=io.StringIO)
def test_post_missing_files(self, _, mock_trovebox):
"""Check that missing files cause an exception"""
post = mock_trovebox.return_value.post
with self.assertRaises(IOError):
main(["-X", "POST", "-F", "photo=@%s.missing" % self.test_file])
@mock.patch.object(sys, "exit", raise_exception)
@mock.patch('sys.stderr', new_callable=io.StringIO)
def test_unknown_arg(self, mock_stderr):