From 5168c4dfdcb055b0d117c4a6767763da0ea0eb65 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 13 Sep 2019 05:04:05 +0900 Subject: [PATCH] django22: django.test.client.encode_multipart no longer accepts None As seen here [1]. When a corresponding field has no selection, an empty string is passed to the server. This change replaces None with an empty string. After this change, all tests pass with Django 2.2, so we can make django22 job voting. [1] https://github.com/django/django/commit/6fe9c45b725 Change-Id: I4cd551253ac361eaa46b6de35369125eb0e20e98 --- .zuul.yaml | 4 ++-- .../dashboards/project/firewalls_v2/tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a317131..13d7baa 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,8 +10,8 @@ check: jobs: - horizon-openstack-tox-python3-django111 - - horizon-openstack-tox-python3-django22: - voting: false + - horizon-openstack-tox-python3-django22 gate: jobs: - horizon-openstack-tox-python3-django111 + - horizon-openstack-tox-python3-django22 diff --git a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tests.py b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tests.py index fe80c4e..b36c051 100644 --- a/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tests.py +++ b/neutron_fwaas_dashboard/dashboards/project/firewalls_v2/tests.py @@ -331,7 +331,7 @@ class FirewallTests(test.TestCase): rules = self.fw_rules_v2.list() tenant_id = self.tenant.id form_data = {'description': policy.description, - 'firewall_rules': None, + 'firewall_rules': '', 'shared': policy.shared, 'audited': policy.audited }