[tryton-commits] changeset in modules/country:default Run all import scripts with...

[Cédric Krier]

changeset 92d1174e6681 in modules/country:default
details: https://hg.tryton.org/modules/country?cmd=changeset;node=92d1174e6681
description:
        Run all import scripts with active_test disabled

        This ensures that all records have the same context and thus can be 
saved
        together.

        issue8730
        review264421002
diffstat:

 scripts/import_countries.py       |  11 ++++-------
 tests/scenario_country_import.rst |   5 +++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 0af5299bf5f0 -r 92d1174e6681 scripts/import_countries.py
--- a/scripts/import_countries.py       Mon Oct 14 00:44:04 2019 +0200
+++ b/scripts/import_countries.py       Thu Oct 24 19:18:42 2019 +0200
@@ -38,9 +38,7 @@
 
 def get_countries():
     Country = Model.get('country.country')
-
-    with config.get_config().set_context(active_test=False):
-        return {c.code: c for c in Country.find([])}
+    return {c.code: c for c in Country.find([])}
 
 
 def update_countries(countries):
@@ -85,9 +83,7 @@
 
 def get_subdivisions():
     Subdivision = Model.get('country.subdivision')
-
-    with config.get_config().set_context(active_test=False):
-        return {(s.country.code, s.code): s for s in Subdivision.find([])}
+    return {(s.country.code, s.code): s for s in Subdivision.find([])}
 
 
 def update_subdivisions(countries, subdivisions):
@@ -151,7 +147,8 @@
 
 def main(database, config_file=None):
     config.set_trytond(database, config_file=config_file)
-    do_import()
+    with config.get_config().set_context(active_test=False):
+        do_import()
 
 
 def do_import():
diff -r 0af5299bf5f0 -r 92d1174e6681 tests/scenario_country_import.rst
--- a/tests/scenario_country_import.rst Mon Oct 14 00:44:04 2019 +0200
+++ b/tests/scenario_country_import.rst Thu Oct 24 19:18:42 2019 +0200
@@ -4,6 +4,7 @@
 
 Imports::
 
+    >>> from proteus import Model
     >>> from trytond.tests.tools import activate_modules
     >>> from trytond.modules.country.scripts import import_countries, 
import_zip
 
@@ -13,6 +14,10 @@
 
 Import countries::
 
+    >>> Country = Model.get('country.country')
+    >>> belgium = Country(name="Belgium", code='BE')
+    >>> belgium.save()
+
     >>> import_countries.do_import()
 
 Import ZIP::