Update session headers instead of overwriting

Author: leszekhanusz

gql/transport/requests.py

@@ -124,7 +124,7 @@ def connect(self):
             self.session = requests.Session()
 
             if self.headers:
-                self.session.headers = CaseInsensitiveDict(self.headers)
+                self.session.headers.update(self.headers)
 
             # If we specified some retries, we provide a predefined retry-logic
             if self.retries > 0:

tests/test_aiohttp.py

@@ -87,16 +87,6 @@ async def handler(request):
         assert transport.response_headers["dummy"] == "test1234"
 
 
-@pytest.mark.asyncio
-async def test_aio_http_transport_session():
-    from gql.transport.aiohttp import AIOHTTPTransport
-
-    transport = AIOHTTPTransport("url", headers={"test": "header"})
-    await transport.connect()
-    assert transport.session
-    assert transport.headers == transport.session.headers
-
-
 @pytest.mark.asyncio
 async def test_aiohttp_request_extensions(aiohttp_server):
     from aiohttp import web
@@ -1928,3 +1918,25 @@ async def handler(request):
             await session.execute("qmlsdkfj")
 
         assert "request should be a GraphQLRequest object" in str(exc_info.value)
+
+
+@pytest.mark.asyncio
+async def test_aiohttp_save_headers_in_session():
+    """Regression test for issue #613"""
+    from gql.transport.aiohttp import AIOHTTPTransport
+
+    transport = AIOHTTPTransport("url", headers={"test": "header"})
+    await transport.connect()
+    assert transport.session
+    assert transport.session.headers["test"] == "header"
+
+    transport2 = AIOHTTPTransport("url")
+    await transport2.connect()
+    assert transport2.session
+
+    del transport.session.headers["test"]
+
+    assert transport.session.headers == transport2.session.headers
+
+    await transport.close()
+    await transport2.close()

tests/test_requests.py

@@ -41,15 +41,6 @@
 )
 
 
-def test_requests_http_transport_session():
-    from gql.transport.requests import RequestsHTTPTransport
-
-    transport = RequestsHTTPTransport("url", headers={"test": "header"})
-    transport.connect()
-    assert transport.session
-    assert transport.headers == transport.session.headers
-
-
 @pytest.mark.aiohttp
 @pytest.mark.asyncio
 async def test_requests_query(aiohttp_server, run_sync_test):
@@ -1281,3 +1272,24 @@ def test_code():
             assert pi == Decimal("3.141592653589793238462643383279502884197")
 
     await run_sync_test(server, test_code)
+
+
+def test_requests_save_headers_in_session():
+    """Regression test for issue #613"""
+    from gql.transport.requests import RequestsHTTPTransport
+
+    transport = RequestsHTTPTransport("url", headers={"test": "header"})
+    transport.connect()
+    assert transport.session
+    assert transport.session.headers["test"] == "header"
+
+    transport2 = RequestsHTTPTransport("url")
+    transport2.connect()
+    assert transport2.session
+
+    del transport.session.headers["test"]
+
+    assert transport.session.headers == transport2.session.headers
+
+    transport.close()
+    transport2.close()