Merge pull request #61 from wildfoundry/premature-close

fix for premature close

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.2.5] - 2018-05-28
+
+### Fixed
+
+- Traceback if close is called prior to WebSocket ready
+
 ## [0.2.4] - 2018-05-15
 
 ### Fixed

docs/index.rst

@@ -6,7 +6,7 @@
 Welcome to Dataplicity Lomond's documentation!
 ==============================================
 
-Lomond is a Pythonic Websockets client library designed for reliability
+Lomond is a Pythonic WebSockets client library designed for reliability
 and ease of use.
 
 Sponsor

lomond/_version.py

@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"

lomond/session.py

@@ -57,7 +57,11 @@ def __repr__(self):
     @property
     def session_time(self):
         """Get the time (in seconds) since the WebSocket session started."""
-        return time.time() - self._start_time
+        return (
+            0.0
+            if self._start_time is None else
+            time.time() - self._start_time
+        )
 
     def close(self):
         """Close the websocket, if it is open."""
@@ -341,6 +345,8 @@ def run(self,
         url = websocket.url
         # Connecting event
         yield events.Connecting(url)
+        if websocket.is_closed:
+            return
 
         # Create socket and connect to remote server
         try:

tests/test_integration.py

@@ -139,3 +139,17 @@ def test_echo(self):
         assert events[6].name == 'closed'
         assert events[7].name == 'disconnected'
         assert events[7].graceful
+
+    def test_premature_close_connecting(self):
+        """Test close after connecting event."""
+        ws = WebSocket('ws://NEVERCONNECTS')
+        for event in ws:
+            if event.name == 'connecting':
+                ws.close()
+
+    def test_premature_close_connected(self):
+        """Test close after connected event."""
+        ws = WebSocket(self.WS_URL + 'graceful')
+        for event in ws:
+            if event.name == 'connected':
+                ws.close()