# Django test settings for nodeconductor project.
from nodeconductor.server.doc_settings import *

INSTALLED_APPS += (
    'nodeconductor.quotas.tests',
    'nodeconductor.structure.tests',
)

ROOT_URLCONF = 'nodeconductor.structure.tests.urls'


# XXX: This option should be removed after itacloud assembly creation.
NODECONDUCTOR['IS_ITACLOUD'] = True

@@ -92,16 +92,38 @@
 port *%0A%0A
+MEDIA_ROOT = '/tmp/'%0A%0A
 INSTALLE
@@ -264,113 +264,4 @@
 ls'%0A
-%0A%0A# XXX: This option should be removed after itacloud assembly creation.%0ANODECONDUCTOR%5B'IS_ITACLOUD'%5D = True%0A

Fix travis build.