Merge lp://qastaging/~trb143/openlp/localserver into lp://qastaging/openlp
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 2816 | ||||||||||||
| Proposed branch: | lp://qastaging/~trb143/openlp/localserver | ||||||||||||
| Merge into: | lp://qastaging/openlp | ||||||||||||
| Diff against target: |
633 lines (+405/-77) 8 files modified
openlp/.version (+1/-1) openlp/core/app.py (+21/-25) openlp/core/common/i18n.py (+1/-1) openlp/core/server.py (+109/-0) openlp/core/version.py (+6/-42) tests/functional/openlp_core/api/http/test_init.py (+151/-0) tests/functional/openlp_core/test_app.py (+2/-8) tests/functional/openlp_core/test_server.py (+114/-0) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~trb143/openlp/localserver | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tomas Groth | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2018-04-05.
Commit message
Replace the Memory check with a local server which stops and starts correctly.
One the 2nd instance pass the service file if one is included
Stop the 2nd instance starting as it will fail due to port clashes and a monster thread issue(may be connected).
Removed redundant code
Add a number of new tests.
Description of the change
Replace the Memory check with a local server which stops and starts correctly.
One the 2nd instance pass the service file if one is included
Stop the 2nd instance starting as it will fail due to port clashes and a monster thread issue(may be connected).
Removed redundant code
Add a number of new tests.
lp:~trb143/openlp/localserver (revision 2850)
https:/
https:/
https:/
https:/
https:/
https:/
https:/
| Tomas Groth (tomasgroth) | # |
