lp:~jamesodhunt/upstart/fix-python-tests

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1595

Upstart Reviewers: Pending requested 2013-11-14

Diff: 226 lines (+90/-16)

4 files modified

scripts/Makefile.am (+18/-1)
scripts/pyupstart.py.in (+51/-7)
scripts/tests/test_pyupstart_session_init.py (+19/-6)
scripts/tests/test_pyupstart_system_init.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1571. By James Hunt on 2013-11-14

* scripts/pyupstart.py: Renamed to pyupstart.py.in to allow it to be
  built.
* scripts/Makefile.am: Pre-process pyupstart.py.in into pyupstart.py so
  that it knows the location of built binaries.
* scripts/pyupstart.py.in:
  - Add getter functions for init, initctl and upstart-file-bridge that
    allow built binaries to be tested (or system-level binaries if
    UPSTART_TEST_USE_SYSTEM_BINARIES is set.
* scripts/tests/test_pyupstart_session_init.py:
  - Make use of getter functions to find appropriate binaries.
  - Construct our own upstart-file-bridge.conf since packaged version
    no longer usable for testing needs.
* scripts/tests/test_pyupstart_system_init.py:
  - Make use of getter functions to find appropriate binaries.

1570. By James Hunt on 2013-11-13

* Merge of lp:~jamesodhunt/upstart/fix-test_state-test-reprise.

1569. By James Hunt on 2013-11-13

* Merge of lp:~xnox/upstart/xdg-runtime-dir-fixes.

1568. By Dimitri John Ledkov on 2013-11-12

Merge lp:~jamesodhunt/upstart/cleanup-test-xdg-dirs

1567. By Dimitri John Ledkov on 2013-11-11

Unbreak running with non-tap test driver.

1566. By Dimitri John Ledkov on 2013-11-11

Introduce TAP output, mark failing tests as TODO, unset environment
variables that cause test suite failures.

1565. By Dimitri John Ledkov on 2013-11-08

Unset environment variables, to have reproducible test results.

1564. By Dimitri John Ledkov on 2013-11-07

Hacked FORCE target fails with automake1.14, let's switch to non-recursive make.

1563. By Dimitri John Ledkov on 2013-11-07

Fix test to use updated start_upstart_common API

1562. By Dimitri John Ledkov on 2013-11-07

No need to use GNU extension