From c5a92760304edb63164f593fecee3f3fcb432d93 Mon Sep 17 00:00:00 2001
From: Ricky Cook <ricky@spruce.sh>
Date: Mon, 11 Jul 2016 17:39:25 +1000
Subject: [PATCH] Remove workdir from changed_result

---
 dockci/models/job.py           | 18 +++--------------
 tests/models/test_job_model.py | 37 +---------------------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/dockci/models/job.py b/dockci/models/job.py
index 88ad473..87e26fa 100644
--- a/dockci/models/job.py
+++ b/dockci/models/job.py
@@ -253,7 +253,7 @@ def state(self):
         else:
             return 'queued'  # TODO check if queued or queue fail
 
-    def changed_result(self, workdir=None):
+    def changed_result(self):
         """
         Check if this job changed the result from it's ancestor. None if
         there's no result yet
@@ -261,22 +261,10 @@ def changed_result(self, workdir=None):
         if self.result is None:
             return None
 
-        ancestor_job = self.ancestor_job
-        if not ancestor_job:
+        if not self.ancestor_job or self.ancestor_job.result is None:
             return True
 
-        if ancestor_job.result is None:
-            if workdir is None:  # Can't get a better ancestor
-                return True
-
-            ancestor_job = self.project.latest_job_ancestor(
-                workdir, self.commit, complete=True,
-            )
-
-        if not ancestor_job:
-            return True
-
-        return ancestor_job.result != self.result
+        return self.ancestor_job.result != self.result
 
     @property
     def job_output_details(self):
diff --git a/tests/models/test_job_model.py b/tests/models/test_job_model.py
index 552176d..d477bd0 100644
--- a/tests/models/test_job_model.py
+++ b/tests/models/test_job_model.py
@@ -44,42 +44,7 @@ def test_ancestor_complete(self,
         assert job_current.changed_result() == changed
 
 
-    @pytest.mark.parametrize(
-        'prev_result,new_result,changed',
-        CHANGED_RESULT_PARAMS
-    )
-    def test_ancestor_incomplete(self,
-                                 mocker,
-                                 prev_result,
-                                 new_result,
-                                 changed):
-        job_current = Job()
-        job_ancestor_incomplete = Job()
-        job_ancestor = Job()
-        project = Project()
-
-        mocker.patch.object(job_ancestor_incomplete, 'result', new=None)
-        mocker.patch.object(
-            job_current, 'ancestor_job', new=job_ancestor_incomplete,
-        )
-
-        mocker.patch.object(job_current, 'project', new=project)
-        mocker.patch.object(job_current, 'commit', new='fake commit')
-        mocker.patch.object(job_current, 'result', new=new_result)
-        mocker.patch.object(job_ancestor, 'result', new=prev_result)
-
-        ancestor_mock = mocker.patch.object(
-            project, 'latest_job_ancestor', return_value=job_ancestor,
-        )
-
-        assert job_current.changed_result(workdir='fake workdir') == changed
-
-        ancestor_mock.assert_called_once_with(
-            'fake workdir', 'fake commit', complete=True,
-        )
-
-
-    def test_ancestor_incomplete_no_workdir(self, mocker):
+    def test_ancestor_incomplete(self, mocker):
         job_current = Job()
         job_ancestor_incomplete = Job()