From 6d74a0d3ce50906723b4453254bdd6a83aa49073 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Mon, 12 Jun 2017 09:41:35 -0500 Subject: [PATCH] Fix digitalocean plugin tests for Python 3 (#4821) assertItemsEqual() doesn't exist in Python 3.x. Travis didn't fail because of some nose errors (so not all tests were run). --- .../certbot_dns_digitalocean/dns_digitalocean_test.py | 5 +++-- certbot-dns-digitalocean/setup.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/certbot-dns-digitalocean/certbot_dns_digitalocean/dns_digitalocean_test.py b/certbot-dns-digitalocean/certbot_dns_digitalocean/dns_digitalocean_test.py index 7e97eed07..11c8c57d5 100644 --- a/certbot-dns-digitalocean/certbot_dns_digitalocean/dns_digitalocean_test.py +++ b/certbot-dns-digitalocean/certbot_dns_digitalocean/dns_digitalocean_test.py @@ -5,6 +5,7 @@ import unittest import digitalocean import mock +import six from certbot import errors from certbot.plugins import dns_test_common @@ -133,8 +134,8 @@ class DigitalOceanClientTest(unittest.TestCase): correct_record_mock.destroy.assert_called() - self.assertItemsEqual(first_record_mock.destroy.call_args_list, []) - self.assertItemsEqual(last_record_mock.destroy.call_args_list, []) + six.assertCountEqual(self, first_record_mock.destroy.call_args_list, []) + six.assertCountEqual(self, last_record_mock.destroy.call_args_list, []) def test_del_txt_record_error_finding_domain(self): self.manager.get_all_domains.side_effect = API_ERROR diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 13be502e2..6b689f660 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -15,6 +15,7 @@ install_requires = [ # For pkg_resources. >=1.0 so pip resolves it to a version cryptography # will tolerate; see #2599: 'setuptools>=1.0', + 'six', 'zope.interface', ]