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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1568

Upstart Reviewers: Pending requested 2013-11-12

Diff: 776 lines (+249/-161)

9 files modified

ChangeLog (+23/-0)
extra/man/socket-event.7 (+2/-2)
init/Makefile.am (+8/-0)
init/tests/test_main.c (+16/-48)
init/tests/test_xdg.c (+18/-3)
test/test_util_common.c (+153/-0)
test/test_util_common.h (+11/-0)
util/Makefile.am (+4/-0)
util/tests/test_initctl.c (+14/-108)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1250126: upstart tests no longer run unless NIH supports TAP

Undecided

Fix Released

Link a bug report

Related blueprints

1569. By James Hunt on 2013-11-12

* init/Makefile.am:
  - Unset DBUS_SYSTEM_BUS_ADDRESS
  - Explain unsetting vars.
  - test_xdg: link to libtest_util_common.
* init/tests/test_main.c:
  - Include config.h to avoid local NIH test run failure.
  - Remove test-specific XDG_CONFIG_HOME/XDG_RUNTIME_DIR handling and
    call test_common_setup() and test_common_cleanup() instead.
* init/tests/test_xdg.c: Remove test-specific
  XDG_CONFIG_HOME/XDG_RUNTIME_DIR handling and call test_common_setup()
  and test_common_cleanup() instead.
* test/test_util_common.c: Added test_common_setup() and
  test_common_cleanup().
* util/Makefile.am:
  - Unset DBUS_SYSTEM_BUS_ADDRESS
  - Explain unsetting vars.
* util/tests/test_initctl.c: Remove test-specific
  XDG_CONFIG_HOME/XDG_RUNTIME_DIR handling and call test_common_setup()
  and test_common_cleanup() instead.

1568. By James Hunt on 2013-11-12

* extra/man/socket-event.7: PATH => SOCKET_PATH.

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

1560. By James Hunt on 2013-11-06

* Merge of lp:~vorlon/upstart/check-for-overlayfs with minor tweaks.