From 2bc4db1cab68cdb0bd1cf2bcd60b3baa936efa2c Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 26 Nov 2017 00:55:14 +0100 Subject: [PATCH] Add skipif to tests that require connecting to OpenNebula --- hosting/test_views.py | 23 +++++++++++++++++++++-- opennebula_api/tests.py | 15 ++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/hosting/test_views.py b/hosting/test_views.py index 801128bb..e417a5e7 100644 --- a/hosting/test_views.py +++ b/hosting/test_views.py @@ -1,4 +1,3 @@ -from unittest import mock from django.conf import settings from django.test import TestCase from django.core.urlresolvers import reverse @@ -6,7 +5,7 @@ from django.core.urlresolvers import resolve from django.contrib.auth.tokens import default_token_generator from django.utils.http import urlsafe_base64_encode from django.utils.encoding import force_bytes - +from unittest import skipIf from model_mommy import mommy from stored_messages.models import Inbox @@ -41,6 +40,11 @@ class ProcessVMSelectionTestMixin(object): # status_code=302, target_status_code=200) +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping DjangoHostingViewTest""" +) class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin): def setUp(self): @@ -60,6 +64,11 @@ class DjangoHostingViewTest(TestCase, ProcessVMSelectionTestMixin): } +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping RailsHostingViewTest""" +) class RailsHostingViewTest(TestCase, ProcessVMSelectionTestMixin): def setUp(self): @@ -79,6 +88,11 @@ class RailsHostingViewTest(TestCase, ProcessVMSelectionTestMixin): } +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping NodeJSHostingViewTest""" +) class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin): def setUp(self): @@ -98,6 +112,11 @@ class NodeJSHostingViewTest(TestCase, ProcessVMSelectionTestMixin): } +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping HostingPricingViewTest""" +) class HostingPricingViewTest(TestCase): def setUp(self): diff --git a/opennebula_api/tests.py b/opennebula_api/tests.py index b2bf62e0..d25d4be7 100644 --- a/opennebula_api/tests.py +++ b/opennebula_api/tests.py @@ -1,13 +1,21 @@ import random import string +from django.conf import settings from django.test import TestCase +from unittest import skipIf from .models import OpenNebulaManager from .serializers import VirtualMachineSerializer from utils.models import CustomUser +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping + OpenNebulaManagerTestCases""" +) class OpenNebulaManagerTestCases(TestCase): """This class defines the test suite for the opennebula manager model.""" @@ -119,7 +127,12 @@ class OpenNebulaManagerTestCases(TestCase): """Test the opennebula manager requires the user to have a ssh key when creating a new vm""" - +@skipIf( + settings.OPENNEBULA_DOMAIN is None or settings.OPENNEBULA_DOMAIN is + "test_domain", + """OpenNebula details unavailable, so skipping + VirtualMachineSerializerTestCase""" +) class VirtualMachineSerializerTestCase(TestCase): def setUp(self): """Define the test client and other test variables."""