From bd64b91314723408aabfc87d51c2bf30caaeb053 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Wed, 30 Apr 2014 13:31:58 +0100 Subject: oeqa/targetcontrol: restart method shouldn't be abstract And drop the un-needed and un-used restart methods. Only qemu ever used this and actually does it safely. (From OE-Core rev: 1dd1edb5ea551c8a01538b130aa4d0c361eae14d) Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- meta/lib/oeqa/controllers/masterimage.py | 3 --- meta/lib/oeqa/targetcontrol.py | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index 1bd0ab4c66..e8d321f7ab 100644 --- a/meta/lib/oeqa/controllers/masterimage.py +++ b/meta/lib/oeqa/controllers/masterimage.py @@ -133,9 +133,6 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget): bb.plain("%s - reboot/powercycle target" % self.pn) self.power_cycle(self.connection) - def restart(self): - pass - class GummibootTarget(MasterImageHardwareTarget): diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 873a66457a..02cb370f2e 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -70,9 +70,9 @@ class BaseTarget(object): def stop(self): pass - @abstractmethod def restart(self, params=None): - pass + self.stop() + self.start(params) def run(self, cmd, timeout=None): return self.connection.run(cmd, timeout) @@ -170,6 +170,3 @@ class SimpleRemoteTarget(BaseTarget): self.connection = None self.ip = None self.server_ip = None - - def restart(self, params=None): - pass -- cgit v1.2.3-54-g00ecf