NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests to work with new version of aiohttp (>= 3.0)

Browse Source
This commit is contained in:
grossmj committed 2018-10-17 17:32:10 +07:00
1 parent 9ae9209881
commit ab8dc52ece
18 files changed
+218 -184
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/controller/compute.py
+6 -6
View File
@@ -96,9 +96,9 @@ class Compute:
return self._http_session
#def __del__(self):
# pass
# if self._http_session:
# self._http_session.close()
#
# if self._http_session:
# self._http_session.close()
def _set_auth(self, user, password):
"""
@@ -415,7 +415,7 @@ class Compute:
if "version" not in response.json:
msg = "The server {} is not a GNS3 server".format(self._id)
log.error(msg)
self._http_session.close()
await self._http_session.close()
raise aiohttp.web.HTTPConflict(text=msg)
self._capabilities = response.json
@@ -430,13 +430,13 @@ class Compute:
if __version_info__[3] == 0:
# Stable release
log.error(msg)
self._http_session.close()
await self._http_session.close()
self._last_error = msg
raise aiohttp.web.HTTPConflict(text=msg)
elif parse_version(__version__)[:2] != parse_version(response.json["version"])[:2]:
# We don't allow different major version to interact even with dev build
log.error(msg)
self._http_session.close()
await self._http_session.close()
self._last_error = msg
raise aiohttp.web.HTTPConflict(text=msg)
else: