From 3bd64969983e4a7d1427a662faf4436b1a4a37d9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 23 Jun 2016 09:30:22 +0200 Subject: [PATCH] Port test_pagination on Python 3 * test_pagination: use an empty string rather None as marker for bisect. On Python 3, a comparison between None and strings now raises a TypeError. * Remove test_pagination from blacklist-py3.txt to run it on Python 3 Partially implements: blueprint trove-python3 Change-Id: I0c9c7d064ef7df2b15b40029264c33c9e9c9393e --- blacklist-py3.txt | 1 - trove/tests/unittests/common/test_pagination.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/blacklist-py3.txt b/blacklist-py3.txt index acde263db3..a1e81236a8 100644 --- a/blacklist-py3.txt +++ b/blacklist-py3.txt @@ -3,7 +3,6 @@ backup.test_backup_models cluster.test_galera_cluster cluster.test_redis_cluster -common.test_pagination guestagent.test_cassandra_manager guestagent.test_dbaas guestagent.test_mongodb_manager diff --git a/trove/tests/unittests/common/test_pagination.py b/trove/tests/unittests/common/test_pagination.py index 9bd8e8d67c..d27726f5ad 100644 --- a/trove/tests/unittests/common/test_pagination.py +++ b/trove/tests/unittests/common/test_pagination.py @@ -42,7 +42,7 @@ class TestPaginatedDataView(trove_testtools.TestCase): next_page_marker=52) self.assertEqual("52", view.next_page_marker) - def _do_paginate_list(self, limit=None, marker=None, include_marker=False): + def _do_paginate_list(self, limit=None, marker='', include_marker=False): li = ['a', 'b', 'c', 'd', 'e'] return pagination.paginate_list(li, limit=limit, marker=marker, include_marker=include_marker)