Merge branch 'heinzel' of python/django-deploy into master
All checks were successful
buildbot/tox Build done.
All checks were successful
buildbot/tox Build done.
This commit was merged in pull request #7.
This commit is contained in:
@@ -24,7 +24,7 @@ def get_urlpatterns(file_path, urlpatterns):
|
||||
if 'MOUNT' in config[app]:
|
||||
route, urlconf_module = config[app]['MOUNT']
|
||||
if route == '/':
|
||||
pattern = '^$'
|
||||
pattern = '^'
|
||||
else:
|
||||
pattern = '^{}'.format(route)
|
||||
url_obj = url(pattern, include(urlconf_module))
|
||||
|
||||
@@ -174,7 +174,7 @@ class DjangoProjectTestCase(DjangoDeployTestCase):
|
||||
project.mount_app('django_deploy.tests.fake_app1', '')
|
||||
|
||||
expected_urlpatterns = [
|
||||
('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'),
|
||||
('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'),
|
||||
]
|
||||
self.assert_urlpatterns(project_dir, expected_urlpatterns)
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ class ProgramTestCase(DjangoDeployTestCase):
|
||||
|
||||
# Similar code from test_api.test_mount_apps
|
||||
expected_urlpatterns = [
|
||||
('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'),
|
||||
('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'),
|
||||
('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'),
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user