Merge authors:
Dmitrijs Ledkovs (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/fix-qemu-test/+merge/137512
proposed by: Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1393 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Mon 2012-12-03 09:52:27 +0000
message:
* Merge of lp:~xnox/upstart/fix-qemu-test.
modified:
init/tests/test_job_process.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c 2012-11-26 14:04:27 +0000
+++ init/tests/test_job_process.c 2012-12-03 09:40:15 +0000
@@ -4787,11 +4787,21 @@
assert0 (unlink (script));
} else {
TEST_GT (pid, 0);
+ TEST_EQ (waitpid (pid, &status, 0), pid);
}
TEST_ALLOC_SAFE {
/* May alloc space if there is log data */
nih_free (class);
+ if (!test_alloc_failed) {
+ TEST_GT (sprintf (filename, "%s/simple-test.log", dirname), 0);
+ output = fopen (filename, "r");
+ TEST_NE_P (output, NULL);
+ CHECK_FILE_EQ (output, "hello world\r\n", TRUE);
+ TEST_FILE_END (output);
+ TEST_EQ (fclose (output), 0);
+ }
+ unlink (filename);
}
}
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
