External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #962 from ryanpetrello/fix-7843

Browse Source 
fix a unicode handling bug
This commit is contained in:
Ryan Petrello 2018-01-10 18:17:58 -05:00 committed by GitHub
commit 9431b0b6ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/inventory.py
View File

@ -8,6 +8,7 @@ import re
import copy
from urlparse import urljoin
import os.path
import six
# Django
from django.conf import settings
@ -1447,7 +1448,7 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
if '_eager_fields' not in kwargs:
kwargs['_eager_fields'] = {}
if 'name' not in kwargs['_eager_fields']:
name = '{} - {}'.format(self.inventory.name, self.name)
name = six.text_type('{} - {}').format(self.inventory.name, self.name)
name_field = self._meta.get_field('name')
if len(name) > name_field.max_length:
name = name[:name_field.max_length]

11
awx/main/tests/functional/models/test_inventory.py
View File

@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
import pytest
import mock
import six
from django.core.exceptions import ValidationError
@ -156,6 +159,14 @@ def test_inventory_update_name(inventory, inventory_source):
assert iu.name == inventory.name + ' - ' + inventory_source.name
@pytest.mark.django_db
def test_inventory_name_with_unicode(inventory, inventory_source):
inventory.name = six.u('オオオ')
inventory.save()
iu = inventory_source.update()
assert iu.name.startswith(inventory.name)
@pytest.mark.django_db
def test_inventory_update_excessively_long_name(inventory, inventory_source):
inventory.name = 'a' * 400 # field max length 512