diff options
| author | Victor Shyba <victor1984@riseup.net> | 2017-08-30 23:57:35 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2017-09-05 11:08:48 -0300 |
| commit | 115bfd7ca890e5d1a9bdd9df88efc376211cec10 (patch) | |
| tree | f9b16a5e697e6bafcbaaf6d3e3c1b8a6afc4f8ea | |
| parent | 7dcdfdfa66605e4cb2249746f2c157e768f3afe8 (diff) | |
[bug] add schema to incoming couchdb backend
Schema was using a default value instead of using the one passed as a
parameter. Additional test for formatter is also included.
-- Related: #8867
| -rw-r--r-- | src/leap/soledad/server/_incoming.py | 2 | ||||
| -rw-r--r-- | testing/tests/server/test_incoming_resource.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/soledad/server/_incoming.py b/src/leap/soledad/server/_incoming.py index b39f17d0..eded5932 100644 --- a/src/leap/soledad/server/_incoming.py +++ b/src/leap/soledad/server/_incoming.py @@ -100,7 +100,7 @@ class IncomingFormatter(object): def format(self, raw_content, enc_scheme): return {self.INCOMING_KEY: True, self.ERROR_DECRYPTING_KEY: False, - ENC_SCHEME_KEY: EncryptionSchemes.NONE, + ENC_SCHEME_KEY: enc_scheme, ENC_JSON_KEY: raw_content} def preamble(self, raw_content, doc_id): diff --git a/testing/tests/server/test_incoming_resource.py b/testing/tests/server/test_incoming_resource.py index 16e1e720..0d4918b9 100644 --- a/testing/tests/server/test_incoming_resource.py +++ b/testing/tests/server/test_incoming_resource.py @@ -50,3 +50,8 @@ class IncomingResourceTestCase(unittest.TestCase): doc = self.couchdb.put_doc.call_args[0][0] self.assertEquals(doc_id, doc.doc_id) self.assertEquals(formatter.format(content, scheme), doc.content) + + def test_formatter(self): + formatter = IncomingFormatter() + formatted = formatter.format('content', EncryptionSchemes.PUBKEY) + self.assertEquals(formatted['_enc_scheme'], EncryptionSchemes.PUBKEY) |