upstart

Merge lp:~xnox/upstart/xdg-runtime-dir-fixes into lp:upstart

  1. xdg-runtime-dir-fixes
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1569
Proposed branch: lp:~xnox/upstart/xdg-runtime-dir-fixes
Merge into: lp:upstart
Diff against target: 162 lines (+42/-20)
1 file modified
util/tests/test_initctl.c (+42/-20)
To merge this branch: bzr merge lp:~xnox/upstart/xdg-runtime-dir-fixes
Reviewer Review Type Date Requested Status
James Hunt Approve
Review via email: mp+194974@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Hunt (jamesodhunt) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c 2013-11-12 12:17:30 +0000
+++ util/tests/test_initctl.c 2013-11-13 02:53:47 +0000
@@ -10997,7 +10997,7 @@
10997 "start on startup\n"10997 "start on startup\n"
10998 "\n"10998 "\n"
10999 "pre-start script\n"10999 "pre-start script\n"
11000 "initctl set-env foo=bar\n"11000 "%s set-env foo=bar\n"
11001 "\n"11001 "\n"
11002 "# create flag file\n"11002 "# create flag file\n"
11003 "touch \"%s\"\n"11003 "touch \"%s\"\n"
@@ -11016,10 +11016,10 @@
11016 "done\n"11016 "done\n"
11017 "\n"11017 "\n"
11018 "# query value post-re-exec\n"11018 "# query value post-re-exec\n"
11019 "initctl get-env foo\n"11019 "%s get-env foo\n"
11020 "\n"11020 "\n"
11021 "end script\n",11021 "end script\n",
11022 flagfile, flagfile);11022 get_initctl_binary(), flagfile, flagfile, get_initctl_binary());
11023 TEST_NE_P (contents, NULL);11023 TEST_NE_P (contents, NULL);
1102411024
11025 CREATE_FILE (confdir, "foo.conf", contents);11025 CREATE_FILE (confdir, "foo.conf", contents);
@@ -11107,16 +11107,20 @@
11107 nih_local char *session_file = NULL;11107 nih_local char *session_file = NULL;
11108 nih_local char *path = NULL;11108 nih_local char *path = NULL;
11109 nih_local char *expected = NULL;11109 nih_local char *expected = NULL;
11110 nih_local char *original_runtime = NULL;
11110 size_t len;11111 size_t len;
11111 char *value;11112 char *value;
1111211113
11113 TEST_GROUP ("list-sessions");11114 TEST_GROUP ("list-sessions");
1111411115
11115 TEST_FILENAME (dirname);11116 original_runtime = nih_strdup (NULL, getenv("XDG_RUNTIME_DIR"));
11116 TEST_EQ (mkdir (dirname, 0755), 0);11117 TEST_NE_P (original_runtime, NULL);
1111711118
11118 TEST_FILENAME (confdir);11119 TEST_FILENAME (dirname);
11119 TEST_EQ (mkdir (confdir, 0755), 0);11120 TEST_EQ (mkdir (dirname, 0755), 0);
11121
11122 TEST_FILENAME (confdir);
11123 TEST_EQ (mkdir (confdir, 0755), 0);
1112011124
11121 /*******************************************************************/11125 /*******************************************************************/
11122 TEST_FEATURE ("with no instances and XDG_RUNTIME_DIR unset");11126 TEST_FEATURE ("with no instances and XDG_RUNTIME_DIR unset");
@@ -11200,6 +11204,8 @@
11200 TEST_EQ (rmdir (dirname), 0);11204 TEST_EQ (rmdir (dirname), 0);
11201 TEST_EQ (rmdir (confdir), 0);11205 TEST_EQ (rmdir (confdir), 0);
1120211206
11207 TEST_EQ (setenv ("XDG_RUNTIME_DIR", original_runtime, 1), 0);
11208
11203 /*******************************************************************/11209 /*******************************************************************/
11204}11210}
1120511211
@@ -11272,7 +11278,7 @@
11272 char confdir[PATH_MAX];11278 char confdir[PATH_MAX];
11273 char logdir[PATH_MAX];11279 char logdir[PATH_MAX];
11274 char pid_file[PATH_MAX];11280 char pid_file[PATH_MAX];
11275 char sessiondir[PATH_MAX];11281 nih_local char *sessiondir;
11276 nih_local char *cmd = NULL;11282 nih_local char *cmd = NULL;
11277 pid_t upstart_pid = 0;11283 pid_t upstart_pid = 0;
11278 nih_local char *logfile = NULL;11284 nih_local char *logfile = NULL;
@@ -11286,19 +11292,21 @@
1128611292
11287 TEST_GROUP ("Session Init quiesce");11293 TEST_GROUP ("Session Init quiesce");
1128811294
11289 TEST_FILENAME (confdir);11295 TEST_FILENAME (confdir);
11290 TEST_EQ (mkdir (confdir, 0755), 0);11296 TEST_EQ (mkdir (confdir, 0755), 0);
1129111297
11292 TEST_FILENAME (logdir);11298 TEST_FILENAME (logdir);
11293 TEST_EQ (mkdir (logdir, 0755), 0);11299 TEST_EQ (mkdir (logdir, 0755), 0);
1129411300
11295 TEST_FILENAME (sessiondir);11301 sessiondir = nih_strdup (NULL, getenv ("XDG_RUNTIME_DIR"));
11296 TEST_EQ (mkdir (sessiondir, 0755), 0);11302 TEST_NE_P (sessiondir, NULL);
11303
11304 cmd = nih_sprintf (NULL, "rm %s/upstart/sessions/*.session 2>/dev/null", sessiondir);
11305 system (cmd);
1129711306
11298 /* Use the "secret" interface */11307 /* Use the "secret" interface */
11299 TEST_EQ (setenv ("UPSTART_CONFDIR", confdir, 1), 0);11308 TEST_EQ (setenv ("UPSTART_CONFDIR", confdir, 1), 0);
11300 TEST_EQ (setenv ("UPSTART_LOGDIR", logdir, 1), 0);11309 TEST_EQ (setenv ("UPSTART_LOGDIR", logdir, 1), 0);
11301 TEST_EQ (setenv ("XDG_RUNTIME_DIR", sessiondir, 1), 0);
1130211310
11303 /* Reset initctl global from previous tests */11311 /* Reset initctl global from previous tests */
11304 dest_name = NULL;11312 dest_name = NULL;
@@ -12031,7 +12039,6 @@
12031 TEST_EQ (rmdir (session_file), 0);12039 TEST_EQ (rmdir (session_file), 0);
12032 session_file = NIH_MUST (nih_sprintf (NULL, "%s/upstart", sessiondir));12040 session_file = NIH_MUST (nih_sprintf (NULL, "%s/upstart", sessiondir));
12033 TEST_EQ (rmdir (session_file), 0);12041 TEST_EQ (rmdir (session_file), 0);
12034 TEST_EQ (rmdir (sessiondir), 0);
1203512042
12036 /*******************************************************************/12043 /*******************************************************************/
12037}12044}
@@ -12044,6 +12051,7 @@
12044 char logdir[PATH_MAX];12051 char logdir[PATH_MAX];
12045 pid_t upstart_pid = 0;12052 pid_t upstart_pid = 0;
12046 nih_local char *logfile = NULL;12053 nih_local char *logfile = NULL;
12054 nih_local char *original_runtime = NULL;
12047 mode_t job_umask;12055 mode_t job_umask;
12048 nih_local char *job_umask_str = NULL;12056 nih_local char *job_umask_str = NULL;
12049 size_t length;12057 size_t length;
@@ -12052,6 +12060,9 @@
12052 mode_t test_umask = 0077;12060 mode_t test_umask = 0077;
12053 mode_t default_umask = 022;12061 mode_t default_umask = 022;
1205412062
12063 original_runtime = nih_strdup (NULL, getenv ("XDG_RUNTIME_DIR"));
12064 TEST_NE_P (original_runtime, NULL);
12065
12055 TEST_FILENAME (dirname);12066 TEST_FILENAME (dirname);
12056 TEST_EQ (mkdir (dirname, 0755), 0);12067 TEST_EQ (mkdir (dirname, 0755), 0);
12057 TEST_EQ (setenv ("XDG_RUNTIME_DIR", dirname, 1), 0);12068 TEST_EQ (setenv ("XDG_RUNTIME_DIR", dirname, 1), 0);
@@ -12129,6 +12140,7 @@
1212912140
12130 /* Restore */12141 /* Restore */
12131 (void)umask (original_umask);12142 (void)umask (original_umask);
12143 TEST_EQ (setenv ("XDG_RUNTIME_DIR", original_runtime, 1), 0);
1213212144
12133 assert0 (rmdir (confdir));12145 assert0 (rmdir (confdir));
12134 assert0 (rmdir (logdir));12146 assert0 (rmdir (logdir));
@@ -16917,9 +16929,17 @@
16917 nih_local char *dbus_session_address = NULL;16929 nih_local char *dbus_session_address = NULL;
16918 nih_local char *dbus_session_address2 = NULL;16930 nih_local char *dbus_session_address2 = NULL;
16919 nih_local char *upstart_session = NULL;16931 nih_local char *upstart_session = NULL;
16932 nih_local char *original_runtime = NULL;
16933 char dirname[PATH_MAX];
16920 char *address;16934 char *address;
1692116935
16922 TEST_TRUE (getenv ("XDG_RUNTIME_DIR"));16936 original_runtime = nih_strdup (NULL, getenv("XDG_RUNTIME_DIR"));
16937 TEST_NE_P (original_runtime, NULL);
16938
16939 TEST_FILENAME (dirname);
16940 TEST_EQ (mkdir (dirname, 0755), 0);
16941
16942 TEST_EQ (setenv ("XDG_RUNTIME_DIR", dirname, 1), 0);
1692316943
16924 TEST_GROUP ("D-Bus connection");16944 TEST_GROUP ("D-Bus connection");
1692516945
@@ -17114,6 +17134,8 @@
1711417134
17115 /* Stop the 2nd daemon */17135 /* Stop the 2nd daemon */
17116 TEST_DBUS_END (dbus_pid2);17136 TEST_DBUS_END (dbus_pid2);
17137
17138 TEST_EQ (setenv ("XDG_RUNTIME_DIR", original_runtime, 1), 0);
17117}17139}
1711817140
17119int17141int

Subscribers

People subscribed via source and target branches