lp:~jamesodhunt/upstart/bug-1199778

Created by James Hunt on 2013-07-11 and last modified on 2013-07-17
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-1199778
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
James Hunt
Project:
upstart
Status:
Merged

Recent revisions

1514. By James Hunt on 2013-07-17

* Merge of lp:upstart.

1513. By James Hunt on 2013-07-17

* init/tests/test_state.c:
  - test_session_serialise(): Added new test "Ensure session
    deserialisation does not create JobClasses" to assert
    new session deserialisation behaviour.
  - test_session_upgrade2(): Finished writing this test - it now creates
    a fake chroot path, updates the JSON so that all references to the
    chroot session refer to the temporary chroot path, creates 2 jobs
    and then performs the serialisation/deserialisation.
* init/tests/test_util.c:
  - ensure_env_clean():
    - Comments.
    - Added log_unflushed_files.
  - clean_env(): New function that re-initialises the common
    data structures.
* test/test_util_common.c: search_and_replace(): New function.

1512. By James Hunt on 2013-07-16

* init/tests/data/upstart-session2.json: New JSON used by
  test_session_upgrade2().
* init/Makefile.am: Added upstart-session.json and upstart-session2.json
  to TEST_DATA_FILES.
* init/conf.c: conf_source_deserialise_all(): Assert that no conf
  sources have yet been deserialised since now session deserialisation
  avoids creating chroot conf sources (see below).
* init/job_class.c: job_class_deserialise_all(): Formatting.
* init/session.c: session_deserialise_all(): Don't create ConfSources
  for each Session (since they are not actually used).
* init/tests/test_state.c:
  - test_upgrade(): Call ensure_env_clean() both before each test and
    after the last test to ensure it left the environment clean.
  - test_session_upgrade(): Clear up sessions.
  - test_session_upgrade2(): New test.
* init/tests/test_util.c: ensure_env_clean(): New function abstracted
  from code in test_upgrade().

1511. By James Hunt on 2013-07-15

* init/state.c:state_deserialise_resolve_deps(): Updated based on review
  comments.

1510. By James Hunt on 2013-07-15

* init/state.c:
  - state_deserialise_resolve_deps(): Look up class conventionally using
    name and session since existing indexing code unreliable as
    referencing a hash.
  - state_index_to_job_class(): Removed.
* init/tests/test_state.c: test_session_upgrade(): Add check to ensure
  session job with same name as NULL session job does not stop latter
  being deserialised.

1509. By Dimitri John Ledkov on 2013-07-12

Add more asserts in test upgrade-session.

1508. By Dimitri John Ledkov on 2013-07-12

* init/tests/data: upstart-session.json: add stateful re-exec
tests with chroot session. (LP: #1200264)

* init/state.c: state_deserialise_resolve_deps(): properly account
at dependency resolution stage for skipped job_classes from chroot
sessions when those got deserialised. Fixes above unit test.

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

Merge bug fix

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

Commit serialisation test with an active session.

1505. By James Hunt on 2013-07-05

* extra/Makefile.am: Comments.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:upstart
This branch contains Public information 
Everyone can see this information.

Subscribers