Multipart HTTP form

tests/test_cli_http.py

@@ -7,6 +7,8 @@
 
 
 def test_http(socketclass_mock, requests_mock, dbfile_mock, httpcli):
+
+    # Simple Get
     s, o, e = httpcli('get', 'foo.com')
     assert e == ''
     assert o == 'bar'
@@ -18,32 +20,49 @@ def test_http(socketclass_mock, requests_mock, dbfile_mock, httpcli):
     sock.recvfrom.assert_called_once()
     requests_mock.assert_called_with('GET', 'http://10.0.0.2')
 
+    # Url
     s, o, e = httpcli('get', 'foo.com/bar')
     assert s == 0
     requests_mock.assert_called_with('GET', 'http://10.0.0.2/bar')
 
+    # Plain HTTP Content
     s, o, e = httpcli('set', 'foo.com', '1')
     assert s == 0
     requests_mock.assert_called_with('SET', 'http://10.0.0.2', data='1')
 
-    s, o, e = httpcli('set', 'foo.com', 'bar=baz', '?qux=quux')
+    # HTTP Errors
+    requests_mock.return_value.status_code = 400
+    s, o, e = httpcli('get', 'foo.com')
+    assert s == 1
+
+
+def test_http_urlencoded(socketclass_mock, requests_mock, dbfile_mock, httpcli):
+    s, o, e = httpcli('set', 'foo.com', 'bar=baz')
     assert s == 0
     requests_mock.assert_called_with(
         'SET', 'http://10.0.0.2',
         data=[('bar', 'baz')],
-        params=[('qux', 'quux')]
     )
 
-    s, o, e = httpcli('set', 'foo.com', '@bar=baz.txt')
+    # With query string
+    s, o, e = httpcli('set', 'foo.com', 'bar=baz', '?qux=quux')
     assert s == 0
     requests_mock.assert_called_with(
         'SET', 'http://10.0.0.2',
-        files=[('bar', 'baz.txt')],
+        data=[('bar', 'baz')],
+        params=[('qux', 'quux')]
     )
 
-    requests_mock.return_value.status_code = 400
-    s, o, e = httpcli('get', 'foo.com')
-    assert s == 1
+
+def test_http_multipart(socketclass_mock, requests_mock, dbfile_mock, httpcli):
+    barfile = mock.mock_open(read_data='baz content')
+    with mock.patch('uns.cli.open', barfile) as bar:
+        s, o, e = httpcli('set', 'foo.com', '@bar=baz.txt')
+        assert s == 0
+        requests_mock.assert_called_with(
+            'SET', 'http://10.0.0.2',
+            files=[('bar', bar.return_value)],
+        )
 
 
 def test_http_binary_response(socketclass_mock, requests_mock, dbfile_mock,

uns/cli.py

@@ -200,7 +200,7 @@ def __call__(self, args):
             if k[0] == '?':
                 query.append((k[1:], v))
             elif k[0] == '@':
-                files.append((k[1:], v))
+                files.append((k[1:], open(v)))
             else:
                 fields.append((k, v))