From 9c915b0ae4e42b3c4158b32efe35ae3bdfb1d476 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 14 Jul 2016 18:15:01 -0700
Subject: [PATCH] Fix tests

---
 certbot-nginx/certbot_nginx/parser.py            |  2 +-
 certbot-nginx/certbot_nginx/tests/parser_test.py |  2 +-
 certbot-nginx/certbot_nginx/tests/util.py        | 13 ++++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/certbot-nginx/certbot_nginx/parser.py b/certbot-nginx/certbot_nginx/parser.py
index f208d0833..5b6860690 100644
--- a/certbot-nginx/certbot_nginx/parser.py
+++ b/certbot-nginx/certbot_nginx/parser.py
@@ -177,7 +177,7 @@ class NginxParser(object):
         if ssl_options is not None:
             try:
                 with open(ssl_options) as _file:
-                    return nginxparser.load(_file)
+                    return nginxparser.load(_file).spaced
             except IOError:
                 logger.debug("Could not open file: %s", ssl_options)
             except pyparsing.ParseException:
diff --git a/certbot-nginx/certbot_nginx/tests/parser_test.py b/certbot-nginx/certbot_nginx/tests/parser_test.py
index ddd375d96..d0bc32297 100644
--- a/certbot-nginx/certbot_nginx/tests/parser_test.py
+++ b/certbot-nginx/certbot_nginx/tests/parser_test.py
@@ -251,7 +251,7 @@ class NginxParserTest(util.NginxTest):
 
     def test_ssl_options_should_be_parsed_ssl_directives(self):
         nparser = parser.NginxParser(self.config_path, self.ssl_options)
-        self.assertEqual(nparser.loc["ssl_options"],
+        self.assertEqual(nginxparser.UnspacedList(nparser.loc["ssl_options"]),
                          [['ssl_session_cache', 'shared:le_nginx_SSL:1m'],
                           ['ssl_session_timeout', '1440m'],
                           ['ssl_protocols', 'TLSv1 TLSv1.1 TLSv1.2'],
diff --git a/certbot-nginx/certbot_nginx/tests/util.py b/certbot-nginx/certbot_nginx/tests/util.py
index 866e5a9c7..96fdac527 100644
--- a/certbot-nginx/certbot_nginx/tests/util.py
+++ b/certbot-nginx/certbot_nginx/tests/util.py
@@ -17,6 +17,7 @@ from certbot.plugins import common
 
 from certbot_nginx import constants
 from certbot_nginx import configurator
+from certbot_nginx import nginxparser
 
 
 class NginxTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
@@ -84,14 +85,20 @@ def filter_comments(tree):
     def traverse(tree):
         """Generator dropping comment nodes"""
         for entry in tree:
-            key, values = entry
+            # key, values = entry
+            spaceless = [e for e in entry if not nginxparser.spacey(e)]
+            if spaceless:
+                key = spaceless[0]
+                values = spaceless[1] if len(spaceless) > 1 else None
+            else:
+                key = values = ""
             if isinstance(key, list):
                 new = copy.deepcopy(entry)
                 new[1] = filter_comments(values)
                 yield new
             else:
-                if key != '#':
-                    yield entry
+                if key != '#' and spaceless:
+                    yield spaceless
 
     return list(traverse(tree))