Improve coverage and fix bug in tests

Bugfixes:

Odoo tests split to prevent improperly reloading odoo.. The bug
is caused by Odoo:
odoo/odoo@d0ee861

The odoo code loaded by release is older while the version loaded with
git would be newer. For some reasons, odoo wouldn't properly reload and
tests would fail by running tests using addons of a newer version of
odoo with an older core of odoo without the proper imports of
dispatch_rpc

.github/workflows/python-package.yml

@@ -82,7 +82,9 @@ jobs:
         PGPASSWORD: postgres
         PGPORT: 5432
       run: |
-        TEST_ODOO=${{ matrix.odoo-version }} pytest --cov=./ --cov-config=./setup.cfg -v
+        pytest --cov=./ --cov-config=./setup.cfg -v
+        TEST_ODOO=${{ matrix.odoo-version }} pytest --cov=./ --cov-config=./setup.cfg --cov-append -v tests/test_odoo_git.py
+        TEST_ODOO=${{ matrix.odoo-version }} pytest --cov=./ --cov-config=./setup.cfg --cov-append -v tests/test_odoo_release.py
         codecov
 
     - name: Install Odoo

conftest.py

@@ -5,4 +5,5 @@
     odoo_env,
     change_test_dir,
     ignore_warnings,
+    runner
 )

odoo_tools/api/management.py

@@ -1,3 +1,4 @@
+import distro
 import six
 import logging
 import psycopg2
@@ -318,10 +319,7 @@ def install_odoo(
 
         .. _NIGHTLY: https://nightly.odoo.com/
         """
-        if hasattr(opts, 'cache'):
-            cache = opts.cache
-        else:
-            cache = None
+        cache = opts.cache
 
         if release:
             installer = OfficialRelease(
@@ -403,7 +401,7 @@ def packages(self):
 
         return package_list
 
-    def native_packages(self):
+    def native_packages(self, distrib_override=None):
         python_packages = [
             "python3-pip",
             "python3-psycopg2",
@@ -423,10 +421,19 @@ def native_packages(self):
             "curl",
         ]
 
-        distrib = {
-            "default": base_packages + python_packages,
+        distrib_map = {
+            "default": base_packages,
             "ubuntu": base_packages + python_packages,
+            "fedora": base_packages + python_packages,
             "debian": base_packages + python_packages
         }
 
-        return distrib['ubuntu']
+        if distrib_override is not None:
+            distrib_id = distro.id()
+        else:
+            distrib_id = distrib_override
+
+        if distrib_id in distrib_map:
+            return distrib_map[distrib_id]
+        else:
+            return distrib_map['default']

odoo_tools/api/objects.py

@@ -574,12 +574,16 @@ def files(self):
         considered as "sources". It will also yield files located in
         the static folder.
         """
-        for file in self.path.glob('**/*'):
-            if file.is_dir():
-                continue
-            if file.name.endswith('.pyc'):
-                continue
+        all_files = [
+            file
+            for file in self.path.glob('**/*')
+            if not file.is_dir()
+            if not file.name.endswith('.pyc')
+        ]
+
+        all_files.sort()
 
+        for file in all_files:
             yield file
 
     def package(self):

odoo_tools/api/services.py

@@ -66,9 +66,10 @@ def package(
         service,
         output_path,
         fetch_path=None,
-        decrypt_key=None
+        decrypt_key=None,
+        temp_dir_manager=TemporaryDirectory
     ):
-        with TemporaryDirectory() as tempdir:
+        with temp_dir_manager() as tempdir:
             target = Path(tempdir)
 
             self.checkout(

odoo_tools/cli/click/gen.py

@@ -8,3 +8,8 @@
 @click.group()
 def gen():
     pass
+
+
+@gen.command()
+def info():
+    print("Install more modules like odoo-tools-rest")

odoo_tools/cli/click/manage.py

@@ -176,19 +176,10 @@ def setup(
 
     opts = DictObject()
 
-    if not languages:
-        opts.languages = "all"
-    else:
-        opts.languages = languages
-
-    if upgrade:
-        opts.upgrade = True
-
-    if target:
-        opts.target = Path.cwd() / target
-
-    if cache:
-        opts.cache = Path.cwd() / cache
+    opts.languages = languages if languages else "all"
+    opts.upgrade = True if upgrade else False
+    opts.target = Path.cwd() / target if target else None
+    opts.cache = Path.cwd() / cache if cache else None
 
     env.manage.install_odoo(
         version,

odoo_tools/cli/registry.py

@@ -18,7 +18,7 @@ def register(self, name, command):
 
     def register_commands(self):
         for ep in iter_entry_points(group='odootools.command'):
-            registry.register(ep.name, ep.load())
+            self.register(ep.name, ep.load())
 
         for ep in iter_entry_points(group='odootools.command.ext'):
             command = self.groups[ep.name]

odoo_tools/configuration/odoo.py

@@ -121,26 +121,14 @@ def install(self):
             self.installed_release
         )
 
-        if hasattr(self.options, 'languages'):
-            languages = self.options.languages
-        else:
-            languages = 'all'
+        languages = self.options.languages
 
         self.strip_languages(languages)
 
         _logger.info("Installing odoo")
 
-        target = (
-            self.options.target
-            if hasattr(self.options, 'target') and self.options.target
-            else None
-        )
-
-        upgrade = (
-            self.options.upgrade
-            if hasattr(self.options, 'upgrade') and self.options.upgrade
-            else False
-        )
+        target = self.options.target
+        upgrade = self.options.upgrade
 
         args = pip_command(target=target, upgrade=upgrade)
 
@@ -282,45 +270,3 @@ def installed_release(self):
 
     def install(self):
         super().install()
-#
-#
-#   def setup_odoo_from_git(repo, ref, version, options=None):
-#
-#       if hasattr(options, 'cache'):
-#           cache = options.cache
-#       else:
-#           cache = None
-#
-#       installer = GitRelease(
-#           version,
-#           repo,
-#           ref,
-#           options=options,
-#           cache=cache
-#       )
-#
-#       with installer:
-#           if installer.need_update():
-#               installer.fetch()
-#               installer.checkout()
-#               installer.install()
-#
-#
-#   def setup_odoo_release(version, release, options=None):
-#       if hasattr(options, 'cache'):
-#           cache = options.cache
-#       else:
-#           cache = None
-#
-#       installer = OfficialRelease(
-#           version,
-#           release,
-#           options=options,
-#           cache=cache
-#       )
-#
-#       with installer:
-#           if installer.need_update():
-#               installer.fetch()
-#               installer.checkout()
-#               installer.install()

setup.py

@@ -25,6 +25,7 @@
         "packaging",
         "lxml",
         "docutils",
+        "distro",
         "polib",
         "six>=1.12.0",
         "cryptography",

tests/fixtures.py

@@ -2,6 +2,7 @@
 import tempfile
 import sys
 import pytest
+from click.testing import CliRunner
 import subprocess
 from pathlib import Path
 from mock import MagicMock
@@ -10,6 +11,8 @@
     ignore_odoo_warnings,
     ignore_default_warnings
 )
+from odoo_tools.patch import unload_modules
+from odoo_tools.exceptions import OdooNotInstalled
 
 from tests.utils import generate_addons
 
@@ -44,22 +47,17 @@ def odoo_cleanup(env):
     print("tearing down")
     odoo_path = env.path()
 
+    # Remove odoo config
     if Path(env.context.odoo_rc).exists():
         Path(env.context.odoo_rc).unlink()
 
+    # Remove odoo
     subprocess.run(['pip', 'uninstall', '-y', 'odoo'])
-
-    odoo_modules = [
-        key
-        for key in sys.modules.keys()
-        if key.startswith('odoo.')
-    ]
-
-    for mod in odoo_modules:
-        del sys.modules[mod]
-
     subprocess.run(['rm', '-rf', str(odoo_path)])
 
+    # Unload odoo
+    unload_modules("odoo")
+
 
 @pytest.fixture(scope="module")
 def odoo_env():
@@ -69,8 +67,8 @@ def odoo_env():
 
     options.languages = "fr_CA"
     options.upgrade = False
-    options.target = False
-    options.cache = False
+    options.target = None
+    options.cache = None
 
     odoo_version = "{}.0".format(os.environ['TEST_ODOO'])
 
@@ -89,8 +87,8 @@ def odoo_release():
 
     options.languages = "fr_CA"
     options.upgrade = False
-    options.target = False
-    options.cache = False
+    options.target = None
+    options.cache = None
 
     odoo_version = "{}.0".format(os.environ['TEST_ODOO'])
 
@@ -114,3 +112,8 @@ def change_test_dir(request, monkeypatch):
 def ignore_warnings(request):
     ignore_odoo_warnings()
     ignore_default_warnings()
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()

tests/test_api_context.py

@@ -0,0 +1,31 @@
+import os
+import pytest
+from pathlib import Path
+from mock import patch
+from odoo_tools.api.context import Context
+
+
+def test_context_default_odoorc(tmp_path):
+    new_env = {
+        "HOME": str(tmp_path)
+    }
+
+    with patch.dict(os.environ, new_env, clear=True):
+        ctx = Context()
+        assert ctx.default_odoorc() == Path.cwd() / 'odoo.cfg'
+
+    new_env = {
+        "HOME": str(tmp_path),
+    }
+
+    with patch.dict(os.environ, new_env, clear=True):
+        odoo_rc = tmp_path / '.odoorc'
+        with odoo_rc.open('w') as fout:
+            fout.write('')
+
+        ctx = Context()
+        assert ctx.default_odoorc() == odoo_rc
+
+    ctx = Context()
+    assert ctx.default_odoorc() == Path.cwd() / 'odoo.cfg'
+    assert ctx.odoo_rc == Path.cwd() / 'odoo.cfg'