lp:~jamesodhunt/upstart/bug-1360208

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:upstart

Upstart Reviewers: Pending requested 2014-09-16

Diff: 1966 lines (+943/-321)

5 files modified

ChangeLog (+37/-0)
extra/upstart-file-bridge.c (+403/-164)
scripts/pyupstart.py (+46/-20)
scripts/tests/test_pyupstart_session_init.py (+368/-57)
scripts/tests/test_pyupstart_system_init.py (+89/-80)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1360208: file watcher doesn't execute if combining ~ and * in the file description

Medium

In Progress

Link a bug report

Related blueprints

1662. By James Hunt on 2014-10-14

* Sync with lp:upstart.

1661. By James Hunt on 2014-09-16

* extra/upstart-file-bridge.c:
  - Converted original_path() macro to a function.
  - WatchedFile: Added more details on this crucial type.
  - file_filter(): Removed as it was too simplistic and duplicating the
    work of the individual handlers in determining whether a path should
    be considered.
  - create_handler(): Simplified.
  - modify_handler(): Simplified.
  - delete_handler(): Simplified.
  - handle_event(): Now deals with globs and handles tilde+glob jobs
    (LP: #1360208).
  - handle_glob(): New function that allows main handlers to be simplified.
  - Added lots of debug for '--debug'.
  - expand_path(): Only check password database if $HOME not set. This
    allows the tests to use a fake $HOME to check that tilde expansion
    works without modifying the users actual $HOME.
  - New utility functions:
    - file_exists()
    - remove_trailing_slashes()
* scripts/pyupstart.py:
  - Add missing file header.
  - pep8 formatting changes.
* scripts/tests/test_pyupstart_session_init.py: TestFileBridge:
  - test_init_start_file_bridge():
    - Force the file bridge to run with a fake $HOME below /tmp to
      allow testing jobs with paths that require tilde expansion.
    - Run file bridge in foreground to capture debug output.
  - Change tests to check for values of all variables the file-event(7)
    sets.
  - New tests for:
    - glob file job.
    - tilde file job.
    - glob and tilde file job.
* scripts/tests/test_pyupstart_system_init.py: pep8 formatting changes.

1660. By Dimitri John Ledkov on 2014-08-15

Merge lp:~jamesodhunt/upstart/bug-1356824

1659. By James Hunt on 2014-07-24

* Merge of lp:~serge-hallyn/upstart/upstart-fix-cgm-env-tests.

1658. By James Hunt on 2014-07-17

* NEWS: Begin new release.

1657. By James Hunt on 2014-07-16

* NEWS: Release 1.13.1

1656. By James Hunt on 2014-07-16

* Merged lp:~jamesodhunt/upstart/bug-1222705-reprise.

1655. By Dimitri John Ledkov on 2014-07-14

fix pid

1654. By Dimitri John Ledkov on 2014-07-14

Allow either result

1653. By Dimitri John Ledkov on 2014-07-13

clean up test & call job_process_handler