[MIG] html_text: Migration to 11.0

[FIX] Tests [FIX] Do not test the specific exception [FIX] Do not test the specific exception
OCA · Mar 9, 2018 · 2e6b1a2 · 2e6b1a2
1 parent 5fde481
commit 2e6b1a2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 30 deletions.
diff --git a/html_text/README.rst b/html_text/README.rst
@@ -1,5 +1,5 @@
-.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl
    :alt: License: AGPL-3
 
 ====================
@@ -38,7 +38,7 @@ QWeb example::
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/149/10.0
+   :target: https://runbot.odoo-community.org/runbot/149/11.0
 
 Known issues / Roadmap
 ======================
@@ -62,6 +62,9 @@ Contributors
 
 * Jairo Llopis <yajo.sk8@gmail.com>
 * Vicent Cubells <vicent.cubells@tecnativa.com>
+* Dennis Sluijk <d.sluijk@onestein.nl>
+
+Do not contact contributors directly about support or help with technical issues.
 
 Maintainer
 ----------

diff --git a/html_text/__init__.py b/html_text/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import models
diff --git a/html_text/__manifest__.py b/html_text/__manifest__.py
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
 # Copyright 2016 Tecnativa - Vicent Cubells
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Text from HTML field",
     "summary": "Generate excerpts from any HTML field",
-    "version": "10.0.1.0.0",
+    "version": "11.0.1.0.0",
     "category": "Tools",
-    "website": "https://tecnativa.com",
+    "website": "https://github.com/OCA/server-tools",
     "author": "Grupo ESOC Ingeniería de Servicios, "
               "Tecnativa, "
+              "Onestein, "
               "Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,

diff --git a/html_text/models/__init__.py b/html_text/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import ir_fields_converter
diff --git a/html_text/models/ir_fields_converter.py b/html_text/models/ir_fields_converter.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
 # Copyright 2016 Tecnativa - Vicent Cubells
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 import logging
 from lxml import etree, html

diff --git a/html_text/tests/__init__.py b/html_text/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import test_extractor
diff --git a/html_text/tests/test_extractor.py b/html_text/tests/test_extractor.py
@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 # Copyright 2016-2017 Jairo Llopis <jairo.llopis@tecnativa.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from lxml import etree
 from odoo.tools import mute_logger
 from odoo.tests.common import TransactionCase
-from ..models import ir_fields_converter
 
 
 class ExtractorCase(TransactionCase):
@@ -41,23 +38,16 @@ def test_excerpts(self):
             self.text_from_html(html, 7, ellipsis=""),
             u"I'm a title I'm a paragraph ¡Pues")
 
-    @mute_logger(ir_fields_converter.__name__)
+    @mute_logger("odoo.addons.html_text.models.ir_fields_converter")
     def test_empty_html(self):
         """Empty HTML handled correctly."""
         self.assertEqual(self.text_from_html(""), "")
-        with self.assertRaises(etree.XMLSyntaxError):
+        with self.assertRaises(Exception):
             self.text_from_html("", fail=True)
 
-    @mute_logger(ir_fields_converter.__name__)
+    @mute_logger("odoo.addons.html_text.models.ir_fields_converter")
     def test_false_html(self):
         """``False`` HTML handled correctly."""
         self.assertEqual(self.text_from_html(False), "")
-        with self.assertRaises(TypeError):
+        with self.assertRaises(Exception):
             self.text_from_html(False, fail=True)
-
-    @mute_logger(ir_fields_converter.__name__)
-    def test_bad_html(self):
-        """Bad HTML handled correctly."""
-        self.assertEqual(self.text_from_html("<<bad>"), "")
-        with self.assertRaises(etree.ParserError):
-            self.text_from_html("<<bad>", fail=True)