summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-04-30 13:31:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 21:52:32 +0100
commitbd64b91314723408aabfc87d51c2bf30caaeb053 (patch)
tree6a4bb8fb324edfca7227e75fd50c12acf801a777 /meta/lib
parentcc4234eaca0b9b3bb8c0e5ccc894fc4838fa8f46 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/controllers/masterimage.py3
-rw-r--r--meta/lib/oeqa/targetcontrol.py7
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):
133 bb.plain("%s - reboot/powercycle target" % self.pn) 133 bb.plain("%s - reboot/powercycle target" % self.pn)
134 self.power_cycle(self.connection) 134 self.power_cycle(self.connection)
135 135
136 def restart(self):
137 pass
138
139 136
140class GummibootTarget(MasterImageHardwareTarget): 137class GummibootTarget(MasterImageHardwareTarget):
141 138
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):
70 def stop(self): 70 def stop(self):
71 pass 71 pass
72 72
73 @abstractmethod
74 def restart(self, params=None): 73 def restart(self, params=None):
75 pass 74 self.stop()
75 self.start(params)
76 76
77 def run(self, cmd, timeout=None): 77 def run(self, cmd, timeout=None):
78 return self.connection.run(cmd, timeout) 78 return self.connection.run(cmd, timeout)
@@ -170,6 +170,3 @@ class SimpleRemoteTarget(BaseTarget):
170 self.connection = None 170 self.connection = None
171 self.ip = None 171 self.ip = None
172 self.server_ip = None 172 self.server_ip = None
173
174 def restart(self, params=None):
175 pass