From 8035ba287137718077520a31779f3c85e2a7247d Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Wed, 29 Jun 2022 11:25:29 +0200
Subject: [PATCH] [FIX] various test. Readd odoorpc in the requilrements.txt
 file to generate_module_analysis and add comments in the file

---
 .../templates/odoo/python_requirements.txt.j2             | 7 +++++++
 tests/cli_07_upgrade_test.py                              | 8 ++++----
 tests/cli_08_estimate_workload_test.py                    | 8 +++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/odoo_openupgrade_wizard/templates/odoo/python_requirements.txt.j2 b/odoo_openupgrade_wizard/templates/odoo/python_requirements.txt.j2
index f16e14e..e234fdc 100644
--- a/odoo_openupgrade_wizard/templates/odoo/python_requirements.txt.j2
+++ b/odoo_openupgrade_wizard/templates/odoo/python_requirements.txt.j2
@@ -1,5 +1,12 @@
 {%- for python_librairy in python_libraries -%}
 {{ python_librairy }}
 {% endfor %}
+
+# Mandatory library used in all odoo-openupgrade-wizard
 openupgradelib
+
+# Library used to run 'post-migration.py' scripts
 click-odoo
+
+# Library used to run generate-module-analysis command
+odoorpc
diff --git a/tests/cli_07_upgrade_test.py b/tests/cli_07_upgrade_test.py
index 37ee9b5..fc5ce82 100644
--- a/tests/cli_07_upgrade_test.py
+++ b/tests/cli_07_upgrade_test.py
@@ -29,7 +29,7 @@ def test_cli_upgrade():
         ]
     )
 
-    # Ensure that 'base' module is installed at 13.0
+    # Ensure that 'base' module is installed at 14.0
     request = (
         "SELECT latest_version"
         " FROM ir_module_module"
@@ -38,7 +38,7 @@ def test_cli_upgrade():
     )
     latest_version = execute_sql_request(ctx, request, database=db_name)
 
-    assert latest_version[0][0].startswith("13.")
+    assert latest_version[0][0].startswith("14.")
 
     cli_runner_invoke(
         [
@@ -50,7 +50,7 @@ def test_cli_upgrade():
         ]
     )
 
-    # Ensure that 'base' module is installed at 14.0
+    # Ensure that 'base' module is installed at 15.0
     request = (
         "SELECT latest_version"
         " FROM ir_module_module"
@@ -59,4 +59,4 @@ def test_cli_upgrade():
     )
     latest_version = execute_sql_request(ctx, request, database=db_name)
 
-    assert latest_version[0][0].startswith("14.")
+    assert latest_version[0][0].startswith("15.")
diff --git a/tests/cli_08_estimate_workload_test.py b/tests/cli_08_estimate_workload_test.py
index c9e8e5b..23ce71f 100644
--- a/tests/cli_08_estimate_workload_test.py
+++ b/tests/cli_08_estimate_workload_test.py
@@ -14,16 +14,14 @@ class TestCliEstimateWorkload(unittest.TestCase):
                 "estimate-workload",
                 "--extra-modules="
                 # Done Module
-                "account"
+                "base"
                 # Deleted module (because merged)
                 ",account_analytic_default"
-                # Deleted module (because renamed)
-                ",account_facturx"
                 # Deleted module (because lost merge)
-                ",base_gengo"
+                ",account_edi_extended"
                 # Some modules that are not ported (for the time being)
                 ",l10n_be_invoice_bba,l10n_ch_qriban,l10n_latam_base"
-                # OCA Portted Modules
+                # OCA Ported Modules
                 ",web_responsive"
                 # OCA Unported modules
                 ",web_boolean_button"