From c3a01f61afad66667c303def01f012a0feb4000c Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Tue, 22 May 2018 16:34:00 +0100
Subject: [PATCH] framework/workload: Move deployment of gui into `initialize`

We only need to deploy the gui once, therefore move the `deploy` method
call into `initialize` the corresponding `remove` method is already in
`finalize`.
---
 wa/framework/workload.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wa/framework/workload.py b/wa/framework/workload.py
index 1ac3a61f..768340ce 100644
--- a/wa/framework/workload.py
+++ b/wa/framework/workload.py
@@ -286,10 +286,10 @@ class ApkUIWorkload(ApkWorkload):
     @once_per_instance
     def initialize(self, context):
         super(ApkUIWorkload, self).initialize(context)
+        self.gui.deploy()
 
     def setup(self, context):
         super(ApkUIWorkload, self).setup(context)
-        self.gui.deploy()
         self.gui.setup()
 
     def run(self, context):
@@ -367,10 +367,10 @@ class UIWorkload(Workload):
     @once_per_instance
     def initialize(self, context):
         super(UIWorkload, self).initialize(context)
+        self.gui.deploy()
 
     def setup(self, context):
         super(UIWorkload, self).setup(context)
-        self.gui.deploy()
         self.gui.setup()
 
     def run(self, context):