Skip to content

Commit

Permalink
Remove sentry requirement from tests, add Django 1.4.1 to matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
dcramer committed Sep 3, 2012
1 parent 744d660 commit b7f4ac2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 86 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ python:
env:
- DJANGO=1.2.7
- DJANGO=1.3.3
- DJANGO=1.4.1
install:
- sudo apt-get install libevent-dev
- pip install Django==$DJANGO --use-mirrors
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
'nose',
'mock',
'pep8',
'sentry>=4.9.7',
'unittest2',
'webob',
'zerorpc>=0.2.0',
Expand Down
6 changes: 1 addition & 5 deletions tests/contrib/django/models.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
from __future__ import absolute_import

from django.db import models
from sentry.models import GzippedDictField


class TestModel(models.Model):
data = GzippedDictField(blank=True, null=True)

def __unicode__(self):
return unicode(self.data)
pass
8 changes: 4 additions & 4 deletions tests/contrib/django/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,11 +617,11 @@ def fake_gettext(to_translate):


class QuerySetSerializerTestCase(TestCase):
# def test_model_instance(self):
# instance = TestModel(data='{}')
def test_model_instance(self):
instance = TestModel()

# result = transform(instance)
# self.assertEquals(result, '<TestModel: {}>')
result = transform(instance)
self.assertEquals(result, '<TestModel: TestModel object>')

def test_basic(self):
from django.db.models.query import QuerySet
Expand Down
Empty file removed tests/integration/__init__.py
Empty file.
76 changes: 0 additions & 76 deletions tests/integration/tests.py

This file was deleted.

0 comments on commit b7f4ac2

Please sign in to comment.