Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods)

Browse Source
This commit is contained in:
Calen Pennington
2016-06-02 13:29:52 -04:00
parent acc9bca390
commit e93d112c04
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/djangoapps/util/testing.py
View File

@@ -31,8 +31,14 @@ class UrlResetMixin(object):
URLCONF_MODULES = None URLCONF_MODULES = None
def _reset_urls(self, urlconf_modules): def reset_urls(self, urlconf_modules=None):
"""Reset `urls.py` for a set of Django apps.""" """Reset `urls.py` for a set of Django apps."""
if urlconf_modules is None:
urlconf_modules = [settings.ROOT_URLCONF]
if self.URLCONF_MODULES is not None:
urlconf_modules.extend(self.URLCONF_MODULES)
for urlconf in urlconf_modules: for urlconf in urlconf_modules:
if urlconf in sys.modules: if urlconf in sys.modules:
reload(sys.modules[urlconf]) reload(sys.modules[urlconf])
@@ -61,12 +67,8 @@ class UrlResetMixin(object):
""" """
super(UrlResetMixin, self).setUp() super(UrlResetMixin, self).setUp()
urlconf_modules = [settings.ROOT_URLCONF] self.reset_urls()
if self.URLCONF_MODULES is not None: self.addCleanup(self.reset_urls)
urlconf_modules.extend(self.URLCONF_MODULES)
self._reset_urls(urlconf_modules)
self.addCleanup(lambda: self._reset_urls(urlconf_modules))
class EventTestMixin(object): class EventTestMixin(object):