From ea1c52518121045a02c43b2a74a74e8fc83c69f1 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Thu, 27 Oct 2016 16:54:05 +0200 Subject: [PATCH] Fix computes tests --- gns3server/controller/compute.py | 6 +++++- tests/controller/test_compute.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py index e53d5893..6e8bb744 100644 --- a/gns3server/controller/compute.py +++ b/gns3server/controller/compute.py @@ -145,7 +145,11 @@ class Compute: @asyncio.coroutine def update(self, **kwargs): for kw in kwargs: - setattr(self, kw, kwargs[kw]) + if kw not in ("user", "password"): + setattr(self, kw, kwargs[kw]) + # It's important to set user and password at the same time + if "user" in kwargs or "password" in kwargs: + self._set_auth(kwargs.get("user", self._user), kwargs.get("password", self._password)) if self._http_session: self._http_session.close() self._connected = False diff --git a/tests/controller/test_compute.py b/tests/controller/test_compute.py index 2e3fbcde..419c9d98 100644 --- a/tests/controller/test_compute.py +++ b/tests/controller/test_compute.py @@ -358,7 +358,7 @@ def test_images(compute, async_run, images_dir): open(os.path.join(images_dir, "asa.qcow2"), "w+").close() with asyncio_patch("aiohttp.ClientSession.request", return_value=response) as mock: images = async_run(compute.images("qemu")) - mock.assert_called_with("GET", "https://example.com:84/v2/compute/qemu/images", auth=None, data=None, headers={'content-type': 'application/json'}, chunked=False, timeout=120) + mock.assert_called_with("GET", "https://example.com:84/v2/compute/qemu/images", auth=None, data=None, headers={'content-type': 'application/json'}, chunked=False, timeout=None) assert images == [{"filename": "linux.qcow2", "path": "linux.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0}, {"filename": "asa.qcow2", "path": "asa.qcow2", "md5sum": "d41d8cd98f00b204e9800998ecf8427e", "filesize": 0}]