Commit 7a4b44d1 authored by Łukasz Nowak's avatar Łukasz Nowak

cli: Honour PROMISE_TIMEOUT default

Let slapos.grid.slapgrid module control the default cli setting for
promise-timeout
parent 767475e9
...@@ -32,7 +32,7 @@ from slapos.cli.config import ConfigCommand ...@@ -32,7 +32,7 @@ from slapos.cli.config import ConfigCommand
from slapos.grid.utils import setRunning, setFinished from slapos.grid.utils import setRunning, setFinished
from slapos.grid.slapgrid import (merged_options, check_missing_parameters, check_missing_files, from slapos.grid.slapgrid import (merged_options, check_missing_parameters, check_missing_files,
random_delay, create_slapgrid_object) random_delay, create_slapgrid_object, PROMISE_TIMEOUT)
from slapos.util import string_to_boolean from slapos.util import string_to_boolean
...@@ -81,7 +81,7 @@ class SlapgridCommand(ConfigCommand): ...@@ -81,7 +81,7 @@ class SlapgridCommand(ConfigCommand):
type=int, type=int,
help='Periodicity at which buildout should be run in instance.') help='Periodicity at which buildout should be run in instance.')
ap.add_argument('--promise-timeout', ap.add_argument('--promise-timeout',
default=3, default=PROMISE_TIMEOUT,
type=int, type=int,
help='Promise timeout in seconds' help='Promise timeout in seconds'
' (default: %(default)s)') ' (default: %(default)s)')
......
  • @luke This change (or the ones on this push) seems to broken a bunch of tests (check Egg tests)

  • @luke This change (or the ones on this push) seems to broken a bunch of tests (check Egg tests)

    I'll revert them here and I'll use branch as it shall be done.

  • mentioned in commit be5ef0e6

    Toggle commit list
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment