diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-13 06:19:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-13 06:19:35 +0000 |
commit | 902505e98ba5ca09cd971f1a7aaa1ad906140dde (patch) | |
tree | 45ca763b8afd67d6dd6fa2407e824208f7448bfa | |
parent | 4aebef73c5dc0de5b1565b0f6f2f131da0749062 (diff) | |
parent | f54f76ceae36200e4bd7fafd39748fd043c51801 (diff) | |
download | designate-902505e98ba5ca09cd971f1a7aaa1ad906140dde.tar.gz |
Merge "Fix task tests under py3"
-rw-r--r-- | designate/tests/unit/test_producer/test_tasks.py | 2 | ||||
-rw-r--r-- | tests-py3.txt | 2 | ||||
-rw-r--r-- | tox.ini | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/designate/tests/unit/test_producer/test_tasks.py b/designate/tests/unit/test_producer/test_tasks.py index f3138ef4..cf8b6ff7 100644 --- a/designate/tests/unit/test_producer/test_tasks.py +++ b/designate/tests/unit/test_producer/test_tasks.py @@ -91,7 +91,7 @@ class PeriodicTest(TaskTest): central.find_zones.return_value = items # Iterate through the items causing the "paging" to be done. - map(lambda i: next(iterer), items) + list(map(lambda i: next(iterer), items)) central.find_zones.assert_called_once_with( ctxt, {"shard": "BETWEEN 0,9"}, limit=100) diff --git a/tests-py3.txt b/tests-py3.txt deleted file mode 100644 index c8599190..00000000 --- a/tests-py3.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Blacklist of tests failing on Python 3 -designate.tests.unit.test_producer.test_tasks @@ -35,7 +35,7 @@ commands = [testenv:py35] commands = {[testenv]commands} - ostestr --blacklist_file=tests-py3.txt '{posargs}' + ostestr '{posargs}' [testenv:docs] commands = rm -rf doc/build |