[IMP] unittest2 > unittest

The `unittest2` package is simply a backport of `unittest` from the
Standard Library of Python 2.7 to previous versions.

There is no reason to use it any longer.

Closes odoo#6941

Author: leorochael

addons/account/tests/test_reconciliation.py

@@ -1,6 +1,6 @@
 from openerp.addons.account.tests.account_test_classes import AccountingTestCase
 import time
-import unittest2
+import unittest
 
 class TestReconciliation(AccountingTestCase):
 
@@ -209,7 +209,7 @@ def test_statement_euro_invoice_usd_transaction_chf(self):
             self.account_rcv.id: {'debit': 42.0, 'credit': 0.0, 'amount_currency': 50, 'currency_id': self.currency_swiss_id},
         })
 
-    @unittest2.skip('adapt to new accounting')
+    @unittest.skip('adapt to new accounting')
     def test_balanced_exchanges_gain_loss(self):
         # The point of this test is to show that we handle correctly the gain/loss exchanges during reconciliations in foreign currencies.
         # For instance, with a company set in EUR, and a USD rate set to 0.033,

addons/sale/tests/test_product_id_change.py

@@ -1,4 +1,4 @@
-import unittest2
+import unittest
 from openerp.tests.common import TransactionCase
 
 class TestProductIdChange(TransactionCase):
@@ -17,7 +17,7 @@ def setUp(self):
         self.product_model = self.registry('product.product')
         self.so_line_model = self.registry('sale.order.line')
 
-    @unittest2.skip("""
+    @unittest.skip("""
         Due to `sale` rewrite (94716a3f14d929574c46ef165e4364d12a5903ed),
         the commit 503820acb6d82a85c0c49ac26f7e7f8cd73851dd has been partially ignored
         during the forward-port to master and need to be rewritten using new-api.

addons/web/tests/test_menu.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-import unittest2
+import unittest
 
 from ..controllers import main
 
 
-class ActionMungerTest(unittest2.TestCase):
+class ActionMungerTest(unittest.TestCase):
     def test_actual_treeview(self):
         action = {
             "views": [[False, "tree"], [False, "form"],

addons/web/tests/test_serving_base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import random
-import unittest2
+import unittest
 
 from openerp.tools import topological_sort
 
@@ -10,7 +10,7 @@ def sample(population):
         population,
             random.randint(0, min(len(population), 5)))
 
-class TestModulesLoading(unittest2.TestCase):
+class TestModulesLoading(unittest.TestCase):
     def setUp(self):
         self.mods = map(str, range(1000))
     def test_topological_sort(self):

addons/web_editor/tests/test_converter.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import textwrap
-import unittest2
+import unittest
 
 from lxml import etree, html
 from lxml.builder import E
@@ -10,7 +10,7 @@
 from openerp.addons.web_editor.models.ir_qweb import html_to_text
 
 
-class TestHTMLToText(unittest2.TestCase):
+class TestHTMLToText(unittest.TestCase):
     def test_rawstring(self):
         self.assertEqual(
             "foobar",

addons/website/tests/test_converter.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-import unittest2
+import unittest
 from openerp.addons.website.models.website import slugify, unslug
 
-
-class TestUnslug(unittest2.TestCase):
+class TestUnslug(unittest.TestCase):
     def test_unslug(self):
         tests = {
             '': (None, None),
@@ -24,7 +23,7 @@ def test_unslug(self):
             self.assertEqual(unslug(slug), expected)
 
 
-class TestTitleToSlug(unittest2.TestCase):
+class TestTitleToSlug(unittest.TestCase):
     """
     Those tests should pass with or without python-slugify
     See website/models/website.py slugify method

addons/website/tests/test_views.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import itertools
 
-import unittest2
+import unittest
 from lxml import etree as ET, html
 from lxml.html import builder as h
 
@@ -61,7 +61,7 @@ def test_embedded_save(self):
         company = self.registry('res.company').browse(self.cr, self.uid, 1)
         self.assertEqual(company.phone, "+00 00 000 00 0 000")
 
-    @unittest2.skip("save conflict for embedded (saved by third party or previous version in page) not implemented")
+    @unittest.skip("save conflict for embedded (saved by third party or previous version in page) not implemented")
     def test_embedded_conflict(self):
         e1 = h.SPAN("My Company", attrs(model='res.company', id=1, field='name'))
         e2 = h.SPAN("Leeroy Jenkins", attrs(model='res.company', id=1, field='name'))

debian/control

@@ -44,7 +44,6 @@ Depends:
  python-simplejson,
  python-suds,
  python-tz,
- python-unittest2,
  python-vatnumber,
  python-vobject,
  python-werkzeug,

doc/reference/javascript.rst

@@ -1330,11 +1330,6 @@ command-line (or in a CI system), but while actually running it is
 pretty simple the setup of the pre-requisite parts has some
 complexities.
 
-#. Install unittest2_ in your Python environment. Both
-   can trivially be installed via `pip <http://pip-installer.org>`_ or
-   `easy_install
-   <http://packages.python.org/distribute/easy_install.html>`_.
-
 #. Install PhantomJS_. It is a headless
    browser which allows automating running and testing web
    pages. QUnitSuite_ uses it to actually run the qunit_ test suite.
@@ -1402,8 +1397,6 @@ the OpenERP Web test suite.
 
 .. _qunit assertions: http://api.qunitjs.com/category/assert/
 
-.. _unittest2: http://pypi.python.org/pypi/unittest2
-
 .. _QUnitSuite: http://pypi.python.org/pypi/QUnitSuite/
 
 .. _PhantomJS: http://phantomjs.org/

doc/reference/testing.rst

@@ -7,7 +7,7 @@
 Testing Modules
 ===============
 
-Odoo provides support for testing modules using unittest2_.
+Odoo provides support for testing modules using unittest.
 
 To write tests, simply define a ``tests`` sub-package in your module, it will
 be automatically inspected for test modules. Test modules should have a name
@@ -80,5 +80,4 @@ Odoo server.
 As of Odoo 8, running tests outside of the install/update cycle is not
 supported.
 
-.. _unittest2: http://pypi.python.org/pypi/unittest2
 .. _unittest documentation: https://docs.python.org/2/library/unittest.html