diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-06-21 15:16:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-06-21 15:16:54 +0200 |
| commit | 78b2063b29a321d152df9badb2d0324578ffe2ec (patch) | |
| tree | 8ecfa4d4acec837795d84f75c39dc10ab98929d8 /odoo/tests | |
| parent | e416428669fb18b59893b63f1d9769e871ac9321 (diff) | |
| parent | 8747d72f1efbc3f32c41c20d4d3198410639d2aa (diff) | |
[MERGE] forward port branch saas-12.2 up to 8747d72f1ef
Diffstat (limited to 'odoo/tests')
| -rw-r--r-- | odoo/tests/common.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/odoo/tests/common.py b/odoo/tests/common.py index d61d17b9333..603e02ac75b 100644 --- a/odoo/tests/common.py +++ b/odoo/tests/common.py @@ -487,7 +487,7 @@ class ChromeBrowser(): self.chrome_process.wait() if self.user_data_dir and os.path.isdir(self.user_data_dir) and self.user_data_dir != '/': self._logger.info('Removing chrome user profile "%s"', self.user_data_dir) - shutil.rmtree(self.user_data_dir) + shutil.rmtree(self.user_data_dir, ignore_errors=True) # Restore previous signal handler if self.sigxcpu_handler and os.name == 'posix': signal.signal(signal.SIGXCPU, self.sigxcpu_handler) @@ -828,12 +828,12 @@ class HttpCase(TransactionCase): self.opener = requests.Session() self.opener.cookies['session_id'] = self.session_id - def url_open(self, url, data=None, timeout=10): + def url_open(self, url, data=None, timeout=10, headers=None): if url.startswith('/'): url = "http://%s:%s%s" % (HOST, PORT, url) if data: - return self.opener.post(url, data=data, timeout=timeout) - return self.opener.get(url, timeout=timeout) + return self.opener.post(url, data=data, timeout=timeout, headers=headers) + return self.opener.get(url, timeout=timeout, headers=headers) def _wait_remaining_requests(self): t0 = int(time.time()) |