From e489035275e11cc81b2065eb89cb3c9aa1aea23f Mon Sep 17 00:00:00 2001 From: bilbonet Date: Tue, 13 Jul 2021 19:08:14 +0200 Subject: [PATCH] [MIG] base_external_dbsource: Migration to 14.0 --- base_external_dbsource/__manifest__.py | 2 +- base_external_dbsource/exceptions.py | 12 ------------ .../models/base_external_dbsource.py | 12 ++++++------ .../tests/test_base_external_dbsource.py | 7 +++---- 4 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 base_external_dbsource/exceptions.py diff --git a/base_external_dbsource/__manifest__.py b/base_external_dbsource/__manifest__.py index a196c05d..7621ddc7 100644 --- a/base_external_dbsource/__manifest__.py +++ b/base_external_dbsource/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "External Database Sources", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Tools", "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/server-backend", diff --git a/base_external_dbsource/exceptions.py b/base_external_dbsource/exceptions.py deleted file mode 100644 index c4d0144e..00000000 --- a/base_external_dbsource/exceptions.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2016 LasLabs Inc. -# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). - -from odoo.exceptions import UserError - - -class ConnectionFailedError(UserError): - pass - - -class ConnectionSuccessError(UserError): - pass diff --git a/base_external_dbsource/models/base_external_dbsource.py b/base_external_dbsource/models/base_external_dbsource.py index 99d1781a..03fe5cc6 100644 --- a/base_external_dbsource/models/base_external_dbsource.py +++ b/base_external_dbsource/models/base_external_dbsource.py @@ -8,8 +8,7 @@ from contextlib import contextmanager import psycopg2 from odoo import _, api, fields, models, tools - -from ..exceptions import ConnectionFailedError, ConnectionSuccessError +from odoo.exceptions import ValidationError _logger = logging.getLogger(__name__) @@ -41,7 +40,7 @@ class BaseExternalDbsource(models.Model): # to allow for override. PWD_STRING = "PWD=%s;" - name = fields.Char("Datasource name", required=True, size=64) + name = fields.Char("Datasource name", required=True) conn_string = fields.Text( "Connection string", help=""" @@ -59,7 +58,7 @@ class BaseExternalDbsource(models.Model): """, ) conn_string_full = fields.Text(readonly=True, compute="_compute_conn_string_full") - password = fields.Char("Password", size=40) + password = fields.Char("Password") client_cert = fields.Text() client_key = fields.Text() ca_certs = fields.Char(help="Path to CA Certs file on server.") @@ -173,14 +172,15 @@ class BaseExternalDbsource(models.Model): with self.connection_open(): pass except Exception as e: - raise ConnectionFailedError( + raise ValidationError( _("Connection test failed:\n" "Here is what we got instead:\n%s") % tools.ustr(e) ) - raise ConnectionSuccessError( + raise ValidationError( _("Connection test succeeded:\n" "Everything seems properly set up!") ) + def remote_browse(self, record_ids, *args, **kwargs): """It browses for and returns the records from remote by ID diff --git a/base_external_dbsource/tests/test_base_external_dbsource.py b/base_external_dbsource/tests/test_base_external_dbsource.py index fcc47dfe..1fa93bb9 100644 --- a/base_external_dbsource/tests/test_base_external_dbsource.py +++ b/base_external_dbsource/tests/test_base_external_dbsource.py @@ -5,8 +5,7 @@ import mock from odoo.sql_db import connection_info_for from odoo.tests import common -from ..exceptions import ConnectionFailedError, ConnectionSuccessError - +from odoo.exceptions import ValidationError class TestBaseExternalDbsource(common.TransactionCase): def setUp(self): @@ -63,14 +62,14 @@ class TestBaseExternalDbsource(common.TransactionCase): def test_connection_success(self): """ It should raise for successful connection """ - with self.assertRaises(ConnectionSuccessError): + with self.assertRaises(ValidationError): self.dbsource.connection_test() def test_connection_fail(self): """ It should raise for failed/invalid connection """ with mock.patch.object(self.dbsource, "connection_open") as conn: conn.side_effect = Exception - with self.assertRaises(ConnectionFailedError): + with self.assertRaises(ValidationError): self.dbsource.connection_test() def test_connection_open_calls_close(self):