Patchwork [2/8] oeqa/targetcontrol: restart method shouldn't be abstract

login
register
mail settings
Submitter Paul Eggleton
Date April 30, 2014, 12:31 p.m.
Message ID <47e34e047c5193bc1d175c2fdae9e5b2d0f7cd35.1398861075.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/71281/
State Accepted, archived
Headers show

Comments

Paul Eggleton - April 30, 2014, 12:31 p.m.
From: Stefan Stanacar <stefanx.stanacar@intel.com>

And drop the un-needed and un-used restart methods.
Only qemu ever used this and actually does it safely.

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
---
 meta/lib/oeqa/controllers/masterimage.py | 3 ---
 meta/lib/oeqa/targetcontrol.py           | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

Patch

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