From fbcfdf5f8680daeb20b362e3c4c7d4358a77f43d Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 26 Aug 2019 15:37:35 +0100 Subject: [PATCH] django22: Django now truncates using the ellipsis character As seen here [1]. One wonders if we're coupling ourselves rather tightly to Django internals. [1] https://github.com/django/django/commit/201017df308 Change-Id: Ifdcdc540f6027c05eadec6445543842f8cc00e2b Signed-off-by: Stephen Finucane --- horizon/test/unit/tables/test_tables.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/horizon/test/unit/tables/test_tables.py b/horizon/test/unit/tables/test_tables.py index bb8c49a07b..7ae68ee6c2 100644 --- a/horizon/test/unit/tables/test_tables.py +++ b/horizon/test/unit/tables/test_tables.py @@ -18,6 +18,7 @@ import unittest import uuid +import django from django import forms from django import http from django import shortcuts @@ -668,8 +669,12 @@ class DataTableTests(test.TestCase): row = self.table.get_rows()[0] self.assertEqual(35, len(row.cells['status'].data)) - self.assertEqual(u'A Status that is longer than 35 ...', - row.cells['status'].data) + if django.VERSION >= (2, 2): + self.assertEqual(u'A Status that is longer than 35 ch…', + row.cells['status'].data) + else: + self.assertEqual(u'A Status that is longer than 35 ...', + row.cells['status'].data) def test_table_rendering(self): self.table = MyTable(self.request, TEST_DATA)