summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--runtests.py2
-rw-r--r--tests/tests.py5
3 files changed, 3 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index c4ed17e..b1d48c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,5 @@ pip-log.txt
/example_project/local_settings.py
/docs/html
/docs/doctrees
-sentry/sentry_index/
/sentry_index/
+/sentry_test_index \ No newline at end of file
diff --git a/runtests.py b/runtests.py
index dd37677..2f33fb6 100644
--- a/runtests.py
+++ b/runtests.py
@@ -59,7 +59,7 @@ if not settings.configured:
HAYSTACK_SEARCH_ENGINE='whoosh',
SENTRY_SEARCH_ENGINE='whoosh',
SENTRY_SEARCH_OPTIONS={
- 'path': join(dirname(__file__), 'sentry_index'),
+ 'path': join(dirname(__file__), 'sentry_test_index'),
},
)
import djcelery
diff --git a/tests/tests.py b/tests/tests.py
index 08d7e94..466d3b2 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -1,10 +1,6 @@
# -*- coding: utf-8 -*-
import base64
-try:
- import cPickle as pickle
-except ImportError:
- import pickle
import datetime
import getpass
import logging
@@ -30,6 +26,7 @@ from sentry.conf import settings
from sentry.models import Message, GroupedMessage
from sentry.utils import json
from sentry.utils import transform, get_signature, get_auth_header
+from sentry.utils.compat import pickle
from models import TestModel, DuplicateKeyModel
from utils import TestServerThread, conditional_on_module