diff options
author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-04-30 13:31:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 21:52:32 +0100 |
commit | bd64b91314723408aabfc87d51c2bf30caaeb053 (patch) | |
tree | 6a4bb8fb324edfca7227e75fd50c12acf801a777 | |
parent | cc4234eaca0b9b3bb8c0e5ccc894fc4838fa8f46 (diff) | |
download | ast2050-yocto-poky-bd64b91314723408aabfc87d51c2bf30caaeb053.zip ast2050-yocto-poky-bd64b91314723408aabfc87d51c2bf30caaeb053.tar.gz |
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 <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/controllers/masterimage.py | 3 | ||||
-rw-r--r-- | 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 1bd0ab4..e8d321f 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 873a664..02cb370 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 |