From 352d2c617376838cac28355ac26e63b2da36bece Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Tue, 3 Oct 2017 16:19:47 -0700 Subject: [PATCH] don't assume order from a set --- .../certbot_nginx/tests/configurator_test.py | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/certbot-nginx/certbot_nginx/tests/configurator_test.py b/certbot-nginx/certbot_nginx/tests/configurator_test.py index ddbc7a573..dc0875430 100644 --- a/certbot-nginx/certbot_nginx/tests/configurator_test.py +++ b/certbot-nginx/certbot_nginx/tests/configurator_test.py @@ -591,25 +591,7 @@ class NginxConfiguratorTest(util.NginxTest): parsed_default_conf = util.filter_comments(self.config.parser.parsed[default_conf]) - - self.assertEqual([[['server'], - [['listen', 'myhost', 'default_server'], - ['server_name', 'www.example.org'], - [['location', '/'], - [['root', 'html'], - ['index', 'index.html', 'index.htm']]]]], - [['server'], - [['listen', 'myhost'], - ['server_name', 'www.nomatch.com', 'nomatch.com'], - [['location', '/'], - [['root', 'html'], - ['index', 'index.html', 'index.htm']]], - ['listen', '5001', 'ssl'], - ['ssl_certificate', 'example/fullchain.pem'], - ['ssl_certificate_key', 'example/key.pem'], - ['include', self.config.mod_ssl_conf], - ['ssl_dhparam', self.config.ssl_dhparams]]]], - parsed_default_conf) + self.assertTrue(util.contains_at_depth(parsed_default_conf, "nomatch.com", 3)) def test_deploy_no_match_no_default_set(self): default_conf = self.config.parser.abs_path('sites-enabled/default')