Confirm we reset incomplete streams.

Author: Lukasa

hyper/http20/stream.py

@@ -286,9 +286,12 @@ def close(self, error_code=None):
         :param error_code: (optional) The error code to reset the stream with.
         :returns: Nothing.
         """
-        if not self.remote_closed:
+        # FIXME: I think this is overbroad, but for now it's probably ok.
+        if not (self.remote_closed and self.local_closed):
             self._conn.reset_stream(self.stream_id, error_code or 0)
             self._send_cb(self._conn.data_to_send())
+            self.remote_closed = True
+            self.local_closed = True
 
         self._close_cb(self.stream_id)
 

test/test_hyper.py

@@ -463,6 +463,28 @@ def test_sending_file(self, frame_buffer):
         with open(__file__, 'rb') as f:
             assert f.read() == sent_data
 
+    def test_closing_incomplete_stream(self, frame_buffer):
+        # Prepare a socket so we can open a stream.
+        sock = DummySocket()
+        c = HTTP20Connection('www.google.com')
+        c._sock = sock
+
+        # Send a request that involves uploading some data, but don't finish.
+        c.putrequest('POST', '/')
+        c.endheaders(message_body=b'some data', final=False)
+
+        # Close the stream.
+        c.streams[1].close()
+
+        # Get all the frames
+        frame_buffer.add_data(b''.join(sock.queue))
+        frames = list(frame_buffer)
+
+        # The last one should be a RST_STREAM frame.
+        f = frames[-1]
+        assert isinstance(f, RstStreamFrame)
+        assert 1 not in c.streams
+
 
 class TestServerPush(object):
     def setup_method(self, method):