moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Put skipIf condition at correct place

Browse source
This commit is contained in:
PCoder 2017-11-25 21:56:48 +01:00
commit a0e36adebc
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
datacenterlight/tasks.py
View file

@ -8,7 +8,6 @@ from django.core.mail import EmailMessage
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils import translation from django.utils import translation
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from unittest import skipIf
from dynamicweb.celery import app from dynamicweb.celery import app
from hosting.models import HostingOrder, HostingBill from hosting.models import HostingOrder, HostingBill
@ -49,8 +48,6 @@ def retry_task(task, exception=None):
raise task.retry(**kwargs) raise task.retry(**kwargs)
@skipIf(settings.OPENNEBULA_USERNAME is None or
settings.OPENNEBULA_PASSWORD is None)
@app.task(bind=True, max_retries=settings.CELERY_MAX_RETRIES) @app.task(bind=True, max_retries=settings.CELERY_MAX_RETRIES)
def create_vm_task(self, vm_template_id, user, specs, template, def create_vm_task(self, vm_template_id, user, specs, template,
stripe_customer_id, billing_address_data, stripe_customer_id, billing_address_data,

6
datacenterlight/tests.py
View file

@ -8,6 +8,8 @@ from django.conf import settings
from django.core.management import call_command from django.core.management import call_command
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from model_mommy import mommy from model_mommy import mommy
from unittest import skipIf
from datacenterlight.models import VMTemplate from datacenterlight.models import VMTemplate
from datacenterlight.tasks import create_vm_task from datacenterlight.tasks import create_vm_task
from membership.models import StripeCustomer from membership.models import StripeCustomer
@ -47,6 +49,10 @@ class CeleryTaskTestCase(TestCase):
# OpenNebula # OpenNebula
call_command('fetchvmtemplates') call_command('fetchvmtemplates')
@skipIf(settings.OPENNEBULA_USERNAME is None or
settings.OPENNEBULA_USERNAME is "",
"""Opennebula details unavailable, so skipping test_create_vm_task
""")
def test_create_vm_task(self): def test_create_vm_task(self):
"""Tests the create vm task for monthly subscription """Tests the create vm task for monthly subscription