Merge "django22: django.test.client.encode_multipart no longer accepts None"
This commit is contained in:
commit
4557db7ee9
|
@ -10,8 +10,8 @@
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- horizon-openstack-tox-python3-django111
|
- horizon-openstack-tox-python3-django111
|
||||||
- horizon-openstack-tox-python3-django22:
|
- horizon-openstack-tox-python3-django22
|
||||||
voting: false
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- horizon-openstack-tox-python3-django111
|
- horizon-openstack-tox-python3-django111
|
||||||
|
- horizon-openstack-tox-python3-django22
|
||||||
|
|
|
@ -331,7 +331,7 @@ class FirewallTests(test.TestCase):
|
||||||
rules = self.fw_rules_v2.list()
|
rules = self.fw_rules_v2.list()
|
||||||
tenant_id = self.tenant.id
|
tenant_id = self.tenant.id
|
||||||
form_data = {'description': policy.description,
|
form_data = {'description': policy.description,
|
||||||
'firewall_rules': None,
|
'firewall_rules': '',
|
||||||
'shared': policy.shared,
|
'shared': policy.shared,
|
||||||
'audited': policy.audited
|
'audited': policy.audited
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue