openstack/horizon
Code Issues Proposed changes

django22: Handle changes in management commands

Browse Source 
The management commands gained a '--force-color' argument in Django 2.2
[1].

[1] https://github.com/django/django/commit/5195b99e2c3

Change-Id: I6729c3c7acbf42af91575eb83908412cf532ffd7
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2019-08-26 15:30:22 +01:00
parent d2dc6fa665
commit 493c95459d
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
horizon/test/unit/management/commands/test_startdash.py
View File

@ -14,6 +14,7 @@
import mock import mock
import django
from django.core.management import call_command from django.core.management import call_command
from django.core.management import CommandError from django.core.management import CommandError
from django.test import TestCase from django.test import TestCase
@ -29,9 +30,17 @@ class CommandsTestCase(TestCase):
def test_startdash_usage_correct(self, handle): def test_startdash_usage_correct(self, handle):
call_command('startdash', 'test_dash') call_command('startdash', 'test_dash')
handle.assert_called_with(dash_name='test_dash', if django.VERSION >= (2, 2):
extensions=["py", "tmpl", "html", "js", handle.assert_called_with(
"css"], dash_name='test_dash',
extensions=["py", "tmpl", "html", "js", "css"],
files=[], force_color=False, no_color=False, pythonpath=None,
settings=None, skip_checks=True, target=None, template=None,
traceback=False, verbosity=1)
else:
handle.assert_called_with(
dash_name='test_dash',
extensions=["py", "tmpl", "html", "js", "css"],
files=[], no_color=False, pythonpath=None, files=[], no_color=False, pythonpath=None,
settings=None, skip_checks=True, target=None, settings=None, skip_checks=True, target=None, template=None,
template=None, traceback=False, verbosity=1) traceback=False, verbosity=1)

12
horizon/test/unit/management/commands/test_startpanel.py
View File

@ -14,6 +14,7 @@
import mock import mock
import django
from django.core.management import call_command from django.core.management import call_command
from django.core.management import CommandError from django.core.management import CommandError
from django.test import TestCase from django.test import TestCase
@ -29,7 +30,16 @@ class CommandsTestCase(TestCase):
def test_startpanel_usage_correct(self, handle): def test_startpanel_usage_correct(self, handle):
call_command('startpanel', 'test_dash', '--dashboard=foo.bar') call_command('startpanel', 'test_dash', '--dashboard=foo.bar')
handle.assert_called_with(panel_name='test_dash', dashboard='foo.bar', if django.VERSION >= (2, 2):
handle.assert_called_with(
panel_name='test_dash', dashboard='foo.bar',
extensions=["py", "tmpl", "html"],
files=[], force_color=False, no_color=False, pythonpath=None,
settings=None, skip_checks=True, target=None,
template=None, traceback=False, verbosity=1)
else:
handle.assert_called_with(
panel_name='test_dash', dashboard='foo.bar',
extensions=["py", "tmpl", "html"], extensions=["py", "tmpl", "html"],
files=[], no_color=False, pythonpath=None, files=[], no_color=False, pythonpath=None,
settings=None, skip_checks=True, target=None, settings=None, skip_checks=True, target=None,