framework/output: Split out common Output functionality

In preparation for the creation of a DatabaseRunOut split out
functionality that can be shared.

1 files changed, 28 insertions, 23 deletions

diff --git a/wa/framework/output.py b/wa/framework/output.py
index a499564e..aa2d66c2 100644
--- a/wa/framework/output.py
+++ b/wa/framework/output.py
@@ -165,8 +165,35 @@ class Output(object):
     def __str__(self):
         return os.path.basename(self.basepath)
 
+class RunOutputCommon(object):
+    ''' Split out common functionality to form a second base of
+        the RunOutput classes
+    '''
+    @property
+    def run_config(self):
+        if self._combined_config:
+            return self._combined_config.run_config
+
+    @property
+    def settings(self):
+        if self._combined_config:
+            return self._combined_config.settings
+
+    def get_job_spec(self, spec_id):
+        for spec in self.job_specs:
+            if spec.id == spec_id:
+                return spec
+        return None
+
+    def list_workloads(self):
+        workloads = []
+        for job in self.jobs:
+            if job.label not in workloads:
+                workloads.append(job.label)
+        return workloads
+
 
-class RunOutput(Output):
+class RunOutput(Output, RunOutputCommon):
 
     kind = 'run'
 
@@ -208,16 +235,6 @@ class RunOutput(Output):
         return ensure_directory_exists(path)
 
     @property
-    def run_config(self):
-        if self._combined_config:
-            return self._combined_config.run_config
-
-    @property
-    def settings(self):
-        if self._combined_config:
-            return self._combined_config.settings
-
-    @property
     def augmentations(self):
         run_augs = set([])
         for job in self.jobs:
@@ -302,18 +319,6 @@ class RunOutput(Output):
         shutil.move(job_output.basepath, failed_path)
         job_output.basepath = failed_path
 
-    def get_job_spec(self, spec_id):
-        for spec in self.job_specs:
-            if spec.id == spec_id:
-                return spec
-        return None
-
-    def list_workloads(self):
-        workloads = []
-        for job in self.jobs:
-            if job.label not in workloads:
-                workloads.append(job.label)
-        return workloads
 
 
 class JobOutput(Output):