Merge lp://staging/~openerp-dev/openobject-server/6.1-custo-tfr-remove_test-mmu into lp://staging/~openerp-dev/openobject-server/6.1-server-custo-tfr
Proposed by
Max (OpenERP)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~openerp-dev/openobject-server/6.1-custo-tfr-remove_test-mmu |
| Merge into: | lp://staging/~openerp-dev/openobject-server/6.1-server-custo-tfr |
| Diff against target: |
85 lines (+7/-25) 3 files modified
openerp/addons/base/__init__.py (+6/-6) openerp/addons/base/__openerp__.py (+0/-18) openerp/osv/orm.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~openerp-dev/openobject-server/6.1-custo-tfr-remove_test-mmu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| tfr (Openerp) | Pending | ||
|
Review via email:
|
|||
Description of the change
remove std test
To post a comment you must log in.
Unmerged revisions
- 4177. By Max Mumford (<email address hidden>)
-
[merge] with diverged branch
- 4176. By Max Mumford (<email address hidden>)
-
[imp] comment out rollback command to fix problem where test fails due to test data being removed after a rollback from a failed validate caused by a sql constraint
- 4175. By Max Mumford (<email address hidden>)
-
remove reference to test files in __openerp__.py to avoid loading standard test when running mck test
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
