upstart

Merge lp:~xnox/upstart/fix-qemu-test into lp:upstart

  1. fix-qemu-test
  2. Merge into trunk
Proposed by Dimitri John Ledkov on 2012-12-03
Status: Merged
Merged at revision: 1394
Proposed branch: lp:~xnox/upstart/fix-qemu-test
Merge into: lp:upstart
Diff against target: 13 lines (+1/-1)
1 file modified
init/tests/test_job_process.c (+1/-1)
To merge this branch: bzr merge lp:~xnox/upstart/fix-qemu-test
Reviewer Review Type Date Requested Status
James Hunt 2012-12-03 Approve on 2012-12-03
Review via email: mp+137517@code.launchpad.net

Description of the Change

Fix the failed path typo: the log filename is not defined and hence the unlink will always fail.

To post a comment you must log in.
James Hunt (jamesodhunt) wrote :

LGTM. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'init/tests/test_job_process.c'
2--- init/tests/test_job_process.c 2012-12-03 09:40:15 +0000
3+++ init/tests/test_job_process.c 2012-12-03 10:02:25 +0000
4@@ -4793,8 +4793,8 @@
5 TEST_ALLOC_SAFE {
6 /* May alloc space if there is log data */
7 nih_free (class);
8+ TEST_GT (sprintf (filename, "%s/simple-test.log", dirname), 0);
9 if (!test_alloc_failed) {
10- TEST_GT (sprintf (filename, "%s/simple-test.log", dirname), 0);
11 output = fopen (filename, "r");
12 TEST_NE_P (output, NULL);
13 CHECK_FILE_EQ (output, "hello world\r\n", TRUE);

Subscribers

People subscribed via source and target branches