Merge lp:~zyga/checkbox/fix-1442139 into lp:checkbox

[Zygmunt Krynicki]

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

=== modified file 'plainbox/plainbox/impl/session/jobs.py'
--- plainbox/plainbox/impl/session/jobs.py	2015-02-25 23:54:35 +0000
+++ plainbox/plainbox/impl/session/jobs.py	2015-04-09 13:20:47 +0000
@@ -244,7 +244,8 @@
 
 
 def job_via_assign_filter(instance, field, old_value, new_value):
-    if old_value is not pod.UNSET and not isinstance(new_value, JobDefinition):
+    if (old_value is not pod.UNSET and not isinstance(new_value, JobDefinition)
+        and not new_value is None):
         raise TypeError("via_job must be the actual job, not the checksum")
     return new_value
 

=== modified file 'plainbox/plainbox/impl/session/test_jobs.py'
--- plainbox/plainbox/impl/session/test_jobs.py	2015-02-25 23:54:35 +0000
+++ plainbox/plainbox/impl/session/test_jobs.py	2015-04-09 13:20:47 +0000
@@ -241,3 +241,10 @@
         parent = make_job("parent")
         self.job_state.via_job = parent
         self.assertIs(self.job_state.via_job, parent)
+
+    def test_resetting_via_job(self):
+        parent = make_job("parent")
+        self.job_state.via_job = parent
+        self.assertIs(self.job_state.via_job, parent)
+        self.job_state.via_job = None
+        self.assertIs(self.job_state.via_job, None)