← Back to branch summary

~jamesodhunt/upstart/bug-1302117

~jamesodhunt/upstart/bug-1302117

« back to all changes in this revision

Viewing changes to init/tests/test_conf.c

Committer: James Hunt
Date: 2014-06-05 08:42:55 UTC
mfrom: (1613.1.18 trunk)
Revision ID: james.hunt@ubuntu.com-20140605084255-uavg5ysf1ath6dwv

* Sync with lp:upstart.

files removed:
doc/states.png

files modified:
ChangeLog

doc/states.dot

init/Makefile.am

init/conf.c

init/event.c

init/event_operator.c

init/job.c

init/job.h

init/job_class.c

init/job_process.c

init/job_process.h

init/log.c

init/main.c

init/man/init.5

init/man/init.8

init/process.c

init/session.c

init/state.c

init/state.h

init/tests/test_conf.c

init/tests/test_event.c

init/tests/test_job.c

init/tests/test_job_process.c

init/tests/test_main.c

init/tests/test_util.c

scripts/init-checkconf.sh

test/test_util_common.c

test/test_util_common.h

util/initctl.c

util/reboot.c

util/tests/test_initctl.c

util/tests/test_sysv.c

Show diffs side-by-side

added added

removed removed

init/tests/test_conf.c

4550

4550

TEST_NE_P (json, NULL);

4551

4551

4552

4552

/* Test there is no JobClass in the JSON */

4553

TEST_EQ_P (json_object_object_get (json, "job_class"), NULL);

4553

TEST_EQ (json_object_object_get_ex (json, "job_class", NULL), FALSE);

4554

4554

4555

4555

TEST_FEATURE ("ConfFile with no JobClass can be deserialised");

4556

4556

Older »