Merge lp://qastaging/~openerp-dev/openobject-server/trunk-for-caribou-jam into lp://qastaging/openobject-server
Proposed by
Vo Minh Thu
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~openerp-dev/openobject-server/trunk-for-caribou-jam |
Merge into: | lp://qastaging/openobject-server |
Diff against target: |
392 lines (+149/-51) 9 files modified
openerp-server (+2/-0) openerp/addons/base/ir/workflow/print_instance.py (+63/-37) openerp/modules/loading.py (+0/-2) openerp/osv/orm.py (+2/-2) openerp/tests/test_ir_sequence.py (+3/-0) openerp/tools/convert.py (+5/-2) openerp/workflow/instance.py (+10/-1) openerp/workflow/wkf_service.py (+13/-2) openerp/workflow/workitem.py (+51/-5) |
To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-server/trunk-for-caribou-jam |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email:
|
To post a comment you must log in.
Unmerged revisions
- 4279. By Vo Minh Thu
-
[MERGE]merged trunk.
- 4278. By Vo Minh Thu
-
[REV] reverted leftover pydb call.
- 4277. By Olivier Laurent (Open ERP)
-
[FIX] re-raise exception in case of error
- 4276. By Olivier Laurent (Open ERP)
-
[MERGE] merge with trunk
- 4275. By Jigar A.
-
[MERGE] Sync with Trunk
- 4274. By Jigar A.
-
[MERGE] Sync with Trunk
- 4273. By Jigar A.
-
[MERGE] lp:openobject-server
- 4272. By Vo Minh Thu
-
[MERGE] merged trunk.
- 4271. By Vo Minh Thu
-
[FIX] workflow: consider only transitions from already loaded modules.
- 4270. By Vo Minh Thu
-
[MERGE] merged trunk.
This branch makes a few changes to the server to make it possible 1/ to install the demo data, 2/ to run the tests with a single update (i.e. the -u command-line flag) and have the tests pass.
This is intended to somewhat test a migrated database (which would normally not contain the demo data necessary to properly run the tests). The only trick is to set demo=True on the ir_module_module table before proceeding to the update.
So let's go through this.
- Changes in openerp/ addons/ base/ir/ workflow/ print_instance. py don't matter, this is just some minimal refactoring and exposes the ability to dump workflows as SVGs on disk.
- The if self.pool._init and False: in orm.py should clearly be reverted. This means that computing the left/right parents can't be deferred to after the tests (i.e. some tests need that information to be available).
- Changes in openerp/ tests/test_ ir_sequence. py are made to make sure the tests on ir_sequence can be played over again (i.e. one run doesn't affect the next run).
- Changes in openerp/ tools/convert. py are made so we know which data are fresh (i.e. we just created them while reading the imported file): if the data is new, let the workflow run. Maybe it is not necessary any more because of the new noupdate semantic (see next bullet point).
- Changes in openerp/ modules/ loading. py: noupdate is forced only for CSV files. Otherwise, the noupdate attribute is honored (previously, demo data were always in noupdate).
- The openerp/workflow sub-module is changed to ignore activities and transitions that are available in db but defined by modules not already loaded (this is necessary to let workflows run in tests, while being in the middle of the update module graph).