summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/test_soledad.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-27 12:44:15 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-27 12:44:15 -0300
commitaa05d0c2076984ffe7e9b1f3ee84b7b1c0dea6b8 (patch)
tree11931448cecb041f4adaea3b8161b479e135f206 /src/leap/soledad/tests/test_soledad.py
parent8cef16cd458801b1513bbcd6849edc4599204b6f (diff)
parent6238f80b9d9c8ea7091e196ccb69371050fd45db (diff)
Merge remote-tracking branch 'drebs/feature/2356-prevent-some-db-actions-in-server' into develop
Diffstat (limited to 'src/leap/soledad/tests/test_soledad.py')
-rw-r--r--src/leap/soledad/tests/test_soledad.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py
index 5eef039f..1c0e6d4a 100644
--- a/src/leap/soledad/tests/test_soledad.py
+++ b/src/leap/soledad/tests/test_soledad.py
@@ -24,10 +24,7 @@ Tests for general Soledad functionality.
import os
import re
import tempfile
-try:
- import simplejson as json
-except ImportError:
- import json # noqa
+import simplejson as json
from leap.common.testing.basetest import BaseLeapTest