Merge lp:~ken-vandine/dbus-test-runner/help_text into lp:dbus-test-runner

Proposed by Ken VanDine on 2016-10-21
Status: Needs review
Proposed branch: lp:~ken-vandine/dbus-test-runner/help_text
Merge into: lp:dbus-test-runner
Diff against target: 12 lines (+1/-1)
1 file modified
src/dbus-test-runner.c (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/dbus-test-runner/help_text
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2016-10-21 Pending
Review via email: mp+309023@code.launchpad.net

Commit message

fixed max-wait help to reflect the default of 60

Description of the change

fixed max-wait help to reflect the default of 60

To post a comment you must log in.

Unmerged revisions

101. By Ken VanDine on 2016-10-21

fixed max-wait help to reflect the default of 60

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dbus-test-runner.c'
2--- src/dbus-test-runner.c 2016-09-06 14:28:48 +0000
3+++ src/dbus-test-runner.c 2016-10-21 12:55:37 +0000
4@@ -204,7 +204,7 @@
5 {"dbus-config", 'd', 0, G_OPTION_ARG_FILENAME, &dbus_configfile, "Configuration file for newly created DBus server. Defaults to '" DEFAULT_SESSION_CONF "'.", "config_file"},
6 {"bustle-monitor", 0, 0, G_OPTION_ARG_FILENAME, &bustle_cmd, "Path to the Bustle DBus Monitor to use. Defaults to 'bustle-dbus-monitor'.", "executable"},
7 {"bustle-data", 'b', 0, G_OPTION_ARG_FILENAME, &bustle_datafile, "A file to write out data from the bustle logger to.", "data_file"},
8- {"max-wait", 'm', 0, G_OPTION_ARG_INT, &max_wait, "The maximum amount of time the test runner will wait for the test to complete. Default is 30 seconds.", "seconds"},
9+ {"max-wait", 'm', 0, G_OPTION_ARG_INT, &max_wait, "The maximum amount of time the test runner will wait for the test to complete. Default is 60 seconds.", "seconds"},
10 {"keep-env", 0, 0, G_OPTION_ARG_NONE, &keep_env, "Whether to propagate the execution environment to the dbus-server and all the services activated by it. By default the environment is cleared.", NULL },
11 {"bus-type", 0, 0, G_OPTION_ARG_CALLBACK, option_bus_type, "Configures which buses are represented by the tool to the tasks. Default: session", "{session|system|both}" },
12 { NULL, 0, 0, 0, NULL, NULL, NULL }

Subscribers

People subscribed via source and target branches