pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Refactor services tests

This commit is contained in:
Marc 2014-09-17 10:38:03 +00:00
parent 7298c9393e
commit 721bcd9002
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
orchestra/apps/orders/tests/__init__.py Normal file
View File

@ -0,0 +1 @@

0
orchestra/apps/services/tests/functional_tests/__init__.py → orchestra/apps/orders/tests/functional_tests/__init__.py
View File

9
orchestra/apps/services/tests/functional_tests/tests.py → orchestra/apps/orders/tests/functional_tests/tests.py
View File

@ -7,16 +7,15 @@ from django.contrib.contenttypes.models import ContentType
from django.utils import timezone from django.utils import timezone
from orchestra.apps.accounts.models import Account from orchestra.apps.accounts.models import Account
from orchestra.apps.services.models import Service
from orchestra.apps.services import settings as services_settings
from orchestra.apps.users.models import User from orchestra.apps.users.models import User
from orchestra.utils.tests import BaseTestCase, random_ascii from orchestra.utils.tests import BaseTestCase, random_ascii
from ... import settings
from ...models import Service
class ServiceTests(BaseTestCase): class ServiceTests(BaseTestCase):
DEPENDENCIES = ( DEPENDENCIES = (
'orchestra.apps.orders', 'orchestra.apps.services',
'orchestra.apps.users', 'orchestra.apps.users',
'orchestra.apps.users.roles.posix', 'orchestra.apps.users.roles.posix',
) )
@ -80,7 +79,7 @@ class ServiceTests(BaseTestCase):
service = self.create_ftp_service() service = self.create_ftp_service()
self.create_ftp() self.create_ftp()
now = timezone.now() now = timezone.now()
bp_month = settings.SERVICES_SERVICE_ANUAL_BILLING_MONTH bp_month = services_settings.SERVICES_SERVICE_ANUAL_BILLING_MONTH
if now.month > bp_month: if now.month > bp_month:
bp = datetime.datetime(year=now.year+1, month=bp_month, bp = datetime.datetime(year=now.year+1, month=bp_month,
day=1, tzinfo=timezone.get_current_timezone()) day=1, tzinfo=timezone.get_current_timezone())