Merge tag '0.9.2'

Tag version 0.9.2

# gpg: Signature made Thu 22 Dec 2016 05:33:30 PM BRST
# gpg:                using RSA key 0x6071E70DCACC60B2
# gpg: Good signature from "drebs (work key) <db@leap.se>" [ultimate]
# gpg:                 aka "drebs (work key) <drebs@leap.se>" [ultimate]
# Impressão da chave primária: 9F73 295B 6306 E06F 3151  99AE 6071 E70D CACC 60B2

1 files changed, 0 insertions, 38 deletions

diff --git a/testing/tests/perf/test_sqlcipher.py b/testing/tests/perf/test_sqlcipher.py
deleted file mode 100644
index e7a54228..00000000
--- a/testing/tests/perf/test_sqlcipher.py
+++ /dev/null
@@ -1,38 +0,0 @@
-'''
-Tests SoledadClient/SQLCipher interaction
-'''
-import pytest
-
-from twisted.internet.defer import gatherResults
-
-
-def load_up(client, amount, payload, defer=True):
-    results = [client.create_doc({'content': payload}) for _ in xrange(amount)]
-    if defer:
-        return gatherResults(results)
-
-
-def build_test_sqlcipher_async_create(amount, size):
-    @pytest.inlineCallbacks
-    @pytest.mark.benchmark(group="test_sqlcipher_async_create")
-    def test(soledad_client, txbenchmark, payload):
-        client = soledad_client()
-        yield txbenchmark(load_up, client, amount, payload(size))
-    return test
-
-
-def build_test_sqlcipher_create(amount, size):
-    @pytest.mark.benchmark(group="test_sqlcipher_create")
-    def test(soledad_client, benchmark, payload):
-        client = soledad_client()._dbsyncer
-        benchmark(load_up, client, amount, payload(size), defer=False)
-    return test
-
-
-test_async_create_20_500k = build_test_sqlcipher_async_create(20, 500*1000)
-test_async_create_100_100k = build_test_sqlcipher_async_create(100, 100*1000)
-test_async_create_1000_10k = build_test_sqlcipher_async_create(1000, 10*1000)
-# synchronous
-test_create_20_500k = build_test_sqlcipher_create(20, 500*1000)
-test_create_100_100k = build_test_sqlcipher_create(100, 100*1000)
-test_create_1000_10k = build_test_sqlcipher_create(1000, 10*1000)