lp:~thelinuxguy/openlp/fix-version-check

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2805

Tim Bentley: Approve on 2018-01-02

Raoul Snyman: Approve on 2018-01-02

Diff: 110 lines (+34/-10)

3 files modified

.bzrignore (+1/-0)
openlp/core/version.py (+4/-6)
tests/functional/openlp_core/test_version.py (+29/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2807. By Simon Hanna on 2017-12-29

Remove sleep statement

2806. By Simon Hanna on 2017-12-29

Add .cache to bzrignore

2805. By Simon Hanna on 2017-12-29

Add test for fix

2804. By Simon Hanna on 2017-12-29

Fix version checking if response is empty

2803. By Phill on 2017-12-24

Move song test resources

lp:~phill-ridout/openlp/moar_test_cleanups (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2390/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2291/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/86/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/11/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Bra...

2802. By Phill on 2017-12-24

Some more pathlib refactors.
Test tidy ups

lp:~phill-ridout/openlp/pathlib11 (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2384/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2285/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/80/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/5/ [WAITING]
[SUCCESS]
https://ci.openlp.i...

2801. By Tim Bentley on 2017-12-24

All tests migrated to assert from self.assert except projection
All tests pass on linux with pytest and nose2

lp:~trb143/openlp/asserts2 (revision 2839)
https://ci.openlp.io/job/Branch-01-Pull/2381/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2282/ [SUCCESS]
  File "./scripts/jenkins_script.py", line 256, in <module>
    main()
  File "./scripts/jenkins_script.py", line 252, in main
    jenkins_trigger.print_output(can_continue=args.alw...

2800. By Raoul Snyman on 2017-12-23

As part of an ongoing effort to improve our tests, I'd like to re-arrange our branch tests the way I re-arranged the trunk tests. This updates the script, and once it is merged, I'll update Jenkins to match and send a mail to the list to alert everyone.

2799. By Tim Bentley on 2017-12-22

more assert updates and py.test fixes

py.test now runs on the whole test without major errors.

lp:~trb143/openlp/asserts (revision 2826)
https://ci.openlp.io/job/Branch-01-Pull/2371/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2272/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2132/ [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1458/ [SUCCESS]
https://ci.openlp.io/job/Branch-04...

2798. By Phill on 2017-12-21

Number of fixes, including:
* Fix to creation and saving of services
* SongBeamer encoding detection
* OSX plugin, media and presentation controller discovery and import fixes
* Make the ftw thread work in its own thread, rather than the main thread

lp:~phill-ridout/openlp/fixes-V (revision 2801)
https://ci.openlp.io/job/Branch-01-Pull/2351/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2252/ [WAITING]
[RUNNING]
[SUCC...