Fixes issue wtolson#25 - publish error with TLS

.gitignore

@@ -58,3 +58,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# vim
+*.sw*

gnsq/producer.py

@@ -211,8 +211,9 @@ def handle_response(self, conn, response):
         self.logger.debug('[%s] response: %s', conn, response)
 
         if response == nsq.OK:
-            result = self._response_queues[conn].popleft()
-            result.set(response)
+            if conn in self._response_queues:
+                result = self._response_queues[conn].popleft()
+                result.set(response)
 
         self.on_response.send(self, response=response)
 

tests/integration_server.py

@@ -15,7 +15,7 @@ class BaseIntegrationServer(object):
     protocol_re = re.compile(' '.join([
         r'(?P<protocol>[A-Z]+):',
         r'listening on',
-        r'(?P<address>(?:[0-9]{1,3}\.){3}[0-9]{1,3}):(?P<port>[0-9]+)',
+        r'(?P<address>((?:[0-9]{1,3}\.){3}[0-9]{1,3}|(\[\:\:\]))):(?P<port>[0-9]+)',
     ]))
 
     version_re = re.compile(' '.join([
@@ -116,13 +116,14 @@ class NsqdIntegrationServer(BaseIntegrationServer):
     tls_cert = os.path.join(os.path.dirname(__file__), 'cert.pem')
     tls_key = os.path.join(os.path.dirname(__file__), 'key.pem')
 
-    def __init__(self, lookupd=None, **kwargs):
+    def __init__(self, lookupd=None, extra_params=[], **kwargs):
         super(NsqdIntegrationServer, self).__init__(**kwargs)
 
         if self.has_https():
             self.protocols = ('TCP', 'HTTP', 'HTTPS')
 
         self.lookupd = lookupd
+        self.extra_params = extra_params
 
     def has_https(self):
         return self.version >= (0, 2, 28)
@@ -146,8 +147,9 @@ def cmd(self):
             '--tls-cert', self.tls_cert,
             '--tls-key', self.tls_key,
         ]
+        cmd.extend(self.extra_params)
 
-        if self.has_https():
+        if self.has_https() and '--https-address' not in cmd:
             cmd.extend(['--https-address', self._random_address()])
 
         if self.lookupd:

tests/test_producer.py

@@ -4,6 +4,7 @@
 
 import pytest
 import gevent
+import urllib3
 
 from gnsq import NsqdHTTPClient, Producer
 from gnsq.errors import NSQException, NSQNoConnections, NSQInvalid
@@ -110,6 +111,41 @@ def test_publish_error():
         producer.join()
 
 
+@pytest.mark.slow
+@pytest.mark.timeout(SLOW_TIMEOUT)
+def test_tls_publish():
+    extra_params = [
+        '--tls-required', 'true',
+        '--https-address', '127.0.0.1:4152',
+    ]
+    with NsqdIntegrationServer(extra_params=extra_params) as server:
+        producer = Producer(
+            server.tcp_address,
+            tls_options={
+                'keyfile': server.tls_key,
+                'certfile': server.tls_cert,
+            },
+            tls_v1=True,
+        )
+        producer.start()
+
+        for _ in range(100):
+            producer.publish('test', b'hi')
+
+        producer.close()
+        producer.join()
+
+        conn = NsqdHTTPClient(
+            server.address,
+            '4152',
+            connection_class=urllib3.HTTPSConnectionPool,
+            cert_reqs='CERT_NONE',
+        )
+        stats = conn.stats()
+
+        assert stats['topics'][0]['depth'] == 100
+
+
 def test_not_running():
     producer = Producer('192.0.2.1:4150')