← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/upstart/gutsy

« back to all changes in this revision

Viewing changes to init/tests/test_process.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2007-03-11 19:19:00 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20070311191900-y59f23fd1c6t493g
Tags: 0.3.8-1
https://launchpad.net/bugs/89314
* New upstream release:
  - much improved initctl tool.

* Update my standard prep_/undo_/rm_conffile functions to take into account
  current dpkg behaviour wrt obsolete conffiles.  The conffile is now moved
  out of the way in preinst and the moved file deleted in postinst, or moved
  back in postrm abort-upgrade.  This means it's not there when dpkg
  configures the new version, so the conffile is not left in the list.
* Purge backups of modified obsolete conffiles when the package is purged.

* Update runlevel and respawn rule generated in migrate-inittab.pl
  LP: #89314

* Drop 00-libnih-update.patch and 01-libnih-sparc-ftbfs.patch; new upstream
  release includes an up-to-date libnih which contains both patches.
* Drop 10-cant-stop-execless-job.patch; included upstream.
* Drop 20-complex-event-config.patch; this is going to be significantly
  changed upstream, and we don't want to ship something strange.
* Drop 30-fix-warnings.patch; included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/tests/test_process.c
203
203
        putenv ("BAR=baz");
204
204
 
205
205
        job = job_new (NULL, "test");
 
206
        job->id = 1000;
206
207
        job->env = env;
207
208
        env[0] = "FOO=bar";
208
209
        env[1] = NULL;
213
214
 
214
215
        TEST_FILE_EQ_N (output, "PATH=");
215
216
        TEST_FILE_EQ_N (output, "TERM=");
 
217
        TEST_FILE_EQ (output, "UPSTART_JOB_ID=1000\n");
216
218
        TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
217
219
        TEST_FILE_EQ (output, "FOO=bar\n");
218
220
        TEST_FILE_END (output);
237
239
        em = event_emit ("wibble", NULL, em_env);
238
240
 
239
241
        job = job_new (NULL, "test");
 
242
        job->id = 1000;
240
243
        job->cause = em;
241
244
        job->env = env;
242
245
        env[0] = "FOO=bar";
248
251
 
249
252
        TEST_FILE_EQ_N (output, "PATH=");
250
253
        TEST_FILE_EQ_N (output, "TERM=");
 
254
        TEST_FILE_EQ (output, "UPSTART_JOB_ID=1000\n");
251
255
        TEST_FILE_EQ (output, "UPSTART_JOB=test\n");
252
256
        TEST_FILE_EQ (output, "UPSTART_EVENT=wibble\n");
253
257
        TEST_FILE_EQ (output, "FOO=bar\n");