From d363653f1ea8826dd51a5fd12717f72d908f74cc Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 2 Sep 2015 02:03:26 +0000 Subject: [PATCH] resync tests/charmhelpers --- tests/charmhelpers/contrib/amulet/utils.py | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tests/charmhelpers/contrib/amulet/utils.py b/tests/charmhelpers/contrib/amulet/utils.py index c0e0a1f5..60d497c0 100644 --- a/tests/charmhelpers/contrib/amulet/utils.py +++ b/tests/charmhelpers/contrib/amulet/utils.py @@ -114,7 +114,7 @@ class AmuletUtils(object): # /!\ DEPRECATION WARNING (beisner): # New and existing tests should be rewritten to use # validate_services_by_name() as it is aware of init systems. - self.log.warn('/!\\ DEPRECATION WARNING: use ' + self.log.warn('DEPRECATION WARNING: use ' 'validate_services_by_name instead of validate_services ' 'due to init system differences.') @@ -272,12 +272,20 @@ class AmuletUtils(object): def _get_proc_start_time(self, sentry_unit, service, pgrep_full=None): """Get start time of a process based on the last modification time of the /proc/pid directory. - """ - if pgrep_full is True or pgrep_full is False: + + :sentry_unit: The sentry unit to check for the service on + :service: service name to look for in process table + :pgrep_full: [Deprecated] Use full command line search mode with pgrep + :returns: epoch time of service process start + :param commands: list of bash commands + :param sentry_units: list of sentry unit pointers + :returns: None if successful; Failure message otherwise + """ + if pgrep_full is not None: # /!\ DEPRECATION WARNING (beisner): # No longer implemented, as pidof is now used instead of pgrep. # https://bugs.launchpad.net/charm-helpers/+bug/1474030 - self.log.warn('/!\\ DEPRECATION WARNING: pgrep_full bool is no ' + self.log.warn('DEPRECATION WARNING: pgrep_full bool is no ' 'longer implemented re: lp 1474030.') pid_list = self.get_process_id_list(sentry_unit, service) @@ -297,14 +305,13 @@ class AmuletUtils(object): has been restarted. """ # /!\ DEPRECATION WARNING (beisner): - # This is prone to races in that no before-time is known. + # This method is prone to races in that no before-time is known. # Use validate_service_config_changed instead. # NOTE(beisner) pgrep_full is no longer implemented, as pidof is now # used instead of pgrep. pgrep_full is still passed through to ensure # deprecation WARNS. lp1474030 - - self.log.warn('/!\\ DEPRECATION WARNING: use ' + self.log.warn('DEPRECATION WARNING: use ' 'validate_service_config_changed instead of ' 'service_restarted due to known races.') @@ -324,7 +331,7 @@ class AmuletUtils(object): sentry_unit (sentry): The sentry unit to check for the service on mtime (float): The epoch time to check against service (string): service name to look for in process table - pgrep_full: No longer implemented, passed for WARNs + pgrep_full: [Deprecated] Use full command line search mode with pgrep sleep_time (int): Seconds to sleep before looking for process retry_count (int): If service is not found, how many times to retry @@ -413,7 +420,7 @@ class AmuletUtils(object): mtime (float): The epoch time to check against service (string): service name to look for in process table filename (string): The file to check mtime of - pgrep_full: No longer implemented, passed for WARNs + pgrep_full: [Deprecated] Use full command line search mode with pgrep sleep_time (int): Initial sleep in seconds to pass to test helpers retry_count (int): If service is not found, how many times to retry retry_sleep_time (int): Time in seconds to wait between retries