diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
| commit | f2320939a5deec2db2948788479199931e1f9176 (patch) | |
| tree | fc1b12908503d5b7d67cefe34e0c5fb0f908d2a6 /scripts/automation/trex_control_plane/common | |
| parent | 1eed7e59f23d3ab9b957d9822eefe72877e291da (diff) | |
| parent | d04442ab671f768a1b645fb887d4a9cd575c7852 (diff) | |
Merge branch 'master' into cpu_per_core
Conflicts:
scripts/automation/trex_control_plane/server/singleton_daemon.py
Diffstat (limited to 'scripts/automation/trex_control_plane/common')
| -rwxr-xr-x | scripts/automation/trex_control_plane/common/text_opts.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/automation/trex_control_plane/common/text_opts.py b/scripts/automation/trex_control_plane/common/text_opts.py index 78a0ab1f..ab0fd2f2 100755 --- a/scripts/automation/trex_control_plane/common/text_opts.py +++ b/scripts/automation/trex_control_plane/common/text_opts.py @@ -61,6 +61,9 @@ def format_time (t_sec): if t_sec < 0: return "infinite" + if t_sec == 0: + return "zero" + if t_sec < 1: # low numbers for unit in ['ms', 'usec', 'ns']: |