mirror of
https://github.com/pinry/pinry.git
synced 2025-11-14 17:05:50 +01:00
Fix: Add a mark 'IS_TEST' to decide if we should load image-urls
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
from django.conf.urls import include, url
|
from django.conf.urls import url
|
||||||
from . import views
|
from . import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|||||||
@@ -6,5 +6,8 @@ if __name__ == "__main__":
|
|||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pinry.settings.development")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pinry.settings.development")
|
||||||
|
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
|
if 'test' in sys.argv:
|
||||||
|
from django.conf import settings
|
||||||
|
settings.IS_TEST = True
|
||||||
|
|
||||||
execute_from_command_line(sys.argv)
|
execute_from_command_line(sys.argv)
|
||||||
|
|||||||
@@ -134,5 +134,8 @@ IMAGE_SIZES = {
|
|||||||
'square': {'crop': True, 'size': [125, 125]},
|
'square': {'crop': True, 'size': [125, 125]},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# IS_TEST is a variable to mark if the test is running
|
||||||
|
IS_TEST = False
|
||||||
|
|
||||||
# User custom settings
|
# User custom settings
|
||||||
IMAGE_AUTO_DELETE = True
|
IMAGE_AUTO_DELETE = True
|
||||||
|
|||||||
@@ -19,3 +19,10 @@ if settings.DEBUG:
|
|||||||
urlpatterns += [
|
urlpatterns += [
|
||||||
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT, }),
|
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT, }),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if settings.IS_TEST:
|
||||||
|
urlpatterns += staticfiles_urlpatterns()
|
||||||
|
# For test running of django_images
|
||||||
|
urlpatterns += [
|
||||||
|
url(r'^__images/', include('django_images.urls')),
|
||||||
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user