Skip to content
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.

Commit

Permalink
Fix tests for all the versions, yay!
Browse files Browse the repository at this point in the history
  • Loading branch information
Angel Velasquez committed Jan 2, 2015
1 parent cdfe30f commit 312bd68
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ env:
- DJANGO=1.7.1
install:
- pip install -q Django==$DJANGO
- pip install -q nose django-nose
- pip install -q django-autoslug
- pip install -q coverage coveralls
- pip install -r requirements-test.txt
- pip install -e .
script:
- coverage run --source klingon setup.py test
Expand Down
3 changes: 1 addition & 2 deletions klingon/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def test_api_general_usage(self):
self.book.get_translation('es', 'slug'),
self.es_slug,
)
# TODO: check why is not getting the slug
self.assertEquals(
self.book.translations('es'),
{
Expand Down Expand Up @@ -177,7 +176,7 @@ def test_set_translation_in_default_language(self):
class AutomaticTranslationAPITestCase(TestCase):
def setUp(self):
self.library = Library.objects.create(
name="Indepent",
name=u"Indepent",
description="All in ebooks",
)
self.es_name = u"Independiente"
Expand Down
20 changes: 15 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,30 @@ commands = {envpython} runtests.py

[testenv:py34-1.7.X]
basepython = python3.4
deps = https://www.djangoproject.com/download/1.7.1/tarball/
deps =
django17: https://www.djangoproject.com/download/1.7.1/tarball/
-r{toxinidir}/requirements-test.txt

[testenv:py27-1.7.X]
basepython = python2.7
deps = https://www.djangoproject.com/download/1.7.1/tarball/
deps =
django17: https://www.djangoproject.com/download/1.7.1/tarball/
-r{toxinidir}/requirements-test.txt

[testenv:py27-1.6.X]
basepython = python2.7
deps = django>=1.6,<1.7
deps =
django16: django>=1.6,<1.7
-r{toxinidir}/requirements-test.txt

[testenv:py27-1.5.X]
basepython = python2.7
deps = django>=1.5,<1.6
deps =
django15: django>=1.5,<1.6
-r{toxinidir}/requirements-test.txt

[testenv:py27-1.4.X]
basepython = python2.7
deps = django>=1.4,<1.5
deps =
django14: django>=1.4,<1.5
-r{toxinidir}/requirements-test.txt

0 comments on commit 312bd68

Please sign in to comment.