summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-06-22 02:29:52 -0300
committerVictor Shyba <victor1984@riseup.net>2017-07-02 01:32:39 -0300
commitb9a906aadbf9561cff76d406d89b644ee1f0e67a (patch)
treecb568b9b59b3de4d0ebcd96129667a5079c22d3b
parentcbcc049737e26e30db8890e31d6b98725bdb3385 (diff)
[style] fix naming from review
-rw-r--r--server/src/leap/soledad/server/_incoming.py4
-rw-r--r--testing/tests/server/test_incoming_resource.py4
-rw-r--r--testing/tests/server/test_incoming_server.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/server/src/leap/soledad/server/_incoming.py b/server/src/leap/soledad/server/_incoming.py
index 009c0578..1f74a6e4 100644
--- a/server/src/leap/soledad/server/_incoming.py
+++ b/server/src/leap/soledad/server/_incoming.py
@@ -18,9 +18,9 @@
A twisted resource that saves externally delivered documents into user's db.
"""
from twisted.web.resource import Resource
-from leap.soledad.common.document import ServerDocument
from ._config import get_config
from leap.soledad.common.couch.state import CouchServerState
+from leap.soledad.common.document import ServerDocument
from leap.soledad.common.crypto import ENC_JSON_KEY
from leap.soledad.common.crypto import ENC_SCHEME_KEY
from leap.soledad.common.crypto import EncryptionSchemes
@@ -49,7 +49,7 @@ class IncomingResource(Resource):
doc = ServerDocument(doc_id)
doc.content = self.formatter.format(request.content.read(), scheme)
db.put_doc(doc)
- return ''
+ return '{"success": true}'
class IncomingFormatter(object):
diff --git a/testing/tests/server/test_incoming_resource.py b/testing/tests/server/test_incoming_resource.py
index 81925580..e9148b4a 100644
--- a/testing/tests/server/test_incoming_resource.py
+++ b/testing/tests/server/test_incoming_resource.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# test_blobs_resource_validation.py
+# test_incoming_resource.py
# Copyright (C) 2017 LEAP
#
# This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ from uuid import uuid4
from mock import Mock
-class BlobServerTestCase(unittest.TestCase):
+class IncomingResourceTestCase(unittest.TestCase):
def setUp(self):
self.couchdb = Mock()
diff --git a/testing/tests/server/test_incoming_server.py b/testing/tests/server/test_incoming_server.py
index d0410520..afb0c970 100644
--- a/testing/tests/server/test_incoming_server.py
+++ b/testing/tests/server/test_incoming_server.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# test_blobs_server.py
+# test_incoming_server.py
# Copyright (C) 2017 LEAP
#
# This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@ from test_soledad.util import CouchServerStateForTests
from test_soledad.util import CouchDBTestCase
-class BlobServerTestCase(CouchDBTestCase):
+class IncomingServerTestCase(CouchDBTestCase):
def setUp(self):
self.state = CouchServerStateForTests(self.couch_url)