[Merge] lp:~jamesodhunt/upstart/bug-1221466+1222702 into lp:upstart

[James Hunt]

James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-1221466+1222702 into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bug-1221466+1222702/+merge/184829

* extra/upstart-file-bridge.c:
  - create_handler(): Use original_file() for directories
    (LP: #1221466, #1222702).
  - watched_dir_new(): Additional assert.
  - watched_file_new():
    - Additional assert.
    - Store original directory path in file object to ensure reliable
      matching for directories.
* scripts/tests/test_pyupstart_session_init.py: Added file bridge tests
  for directory creation, modification and deletion.

As expected, new tests in this branch fail with current upstart-file-bridge, but pass when using the updated version in this branch.
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1221466+1222702/+merge/184829
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1221466+1222702 into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 12157 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20130910/cfcf111b/attachment.diff>