lp:~jamesodhunt/upstart/fix-test_state-test-reprise

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1570

Dimitri John Ledkov: Approve on 2013-11-13

Diff: 154 lines (+50/-29)

3 files modified

ChangeLog (+12/-0)
init/tests/test_state.c (+21/-4)
test/test_util_common.h (+17/-25)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1570. By James Hunt on 2013-11-13

* init/tests/test_state.c: test_log_serialise():
  - Added extra checks on nih_io_watches.
  - Need to wait for logfile to be written to handle case where NIH
    encounters EAGAIN.
* test/test_util_common.h:
  - Removed unused macros:
    - TEST_FORCE_WATCH_UPDATE_TIMEOUT()
    - TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS()
  - Added TIMED_BLOCK() macro.

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

1561. By Steve Langasek on 2013-11-07

Merge lp:~jamesodhunt/upstart/bug-1238078