From 50060d57ca10bad4009e65857b1ab5e7ea28d92f Mon Sep 17 00:00:00 2001 From: Pete Heist Date: Tue, 12 Dec 2017 21:06:11 +0100 Subject: [PATCH 1/2] Use = with all long form flags with values. --- flent/runners.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flent/runners.py b/flent/runners.py index 294692df..08de2e28 100644 --- a/flent/runners.py +++ b/flent/runners.py @@ -1474,12 +1474,12 @@ def check(self): "Please upgrade to irtt v0.9+." % irtt) args = [irtt, 'client', '-n', '-Q', - '--timeouts', '200ms,300ms,400ms'] + '--timeouts=200ms,300ms,400ms'] if self.local_bind: - args.extend(['--local', self.local_bind]) + args.extend(["--local={}".format(self.local_bind)]) elif self.settings.LOCAL_BIND: - args.extend(['--local', self.settings.LOCAL_BIND[0]]) + args.extend(["--local={}".format(self.settings.LOCAL_BIND[0])]) if self.ip_version is not None: args.append("-{}".format(self.ip_version)) @@ -1497,16 +1497,16 @@ def check(self): if self.marking is not None: try: mk = self.marking.split(",")[0] - marking = "--dscp {}".format(self.marking_map[mk]) + marking = "--dscp={}".format(self.marking_map[mk]) except (AttributeError, KeyError): - marking = "--dscp {}".format(marking) + marking = "--dscp={}".format(marking) else: marking = "" if self.local_bind: - local_bind = "--local {}".format(self.local_bind) + local_bind = "--local={}".format(self.local_bind) elif self.settings.LOCAL_BIND: - local_bind = "--local {}".format(self.settings.LOCAL_BIND[0]) + local_bind = "--local={}".format(self.settings.LOCAL_BIND[0]) else: local_bind = "" @@ -1520,7 +1520,7 @@ def check(self): else: data_size = "" - self.command = "{binary} client -o - --fill rand -Q " \ + self.command = "{binary} client -o - --fill=rand -Q " \ "-d {length}s -i {interval}s {ip_version} {marking} " \ "{local_bind} {data_size} {host}".format( binary=irtt, From 11d5657ccddd8a7048bee3c52993ef7c7949ba63 Mon Sep 17 00:00:00 2001 From: Pete Heist Date: Tue, 12 Dec 2017 22:22:00 +0100 Subject: [PATCH 2/2] Change extend to append. Signed-off-by: Pete Heist --- flent/runners.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flent/runners.py b/flent/runners.py index 08de2e28..b8f97682 100644 --- a/flent/runners.py +++ b/flent/runners.py @@ -1477,9 +1477,9 @@ def check(self): '--timeouts=200ms,300ms,400ms'] if self.local_bind: - args.extend(["--local={}".format(self.local_bind)]) + args.append("--local={}".format(self.local_bind)) elif self.settings.LOCAL_BIND: - args.extend(["--local={}".format(self.settings.LOCAL_BIND[0])]) + args.append("--local={}".format(self.settings.LOCAL_BIND[0])) if self.ip_version is not None: args.append("-{}".format(self.ip_version))