Merge lp:~sylvain-pineau/checkbox/bug1236505 into lp:checkbox

[Sylvain Pineau]

MR for plainbox fixing the linked bug.

The emitAskForOutcomeSignal() methods now returns MemoryJobResult({'outcome': IJobResult.OUTCOME_UNDECIDED})

[Zygmunt Krynicki (zyga)]

review: Approve

[Daniel Manrique (roadmr)]

The attempt to merge lp:~sylvain-pineau/checkbox/bug1236505 into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/6213131/
[precise] stderr: http://paste.ubuntu.com/6213132/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Forcing shutdown of VM...
[precise] Destroying VM and associated drives...
[quantal] Bringing VM 'up'
[quantal] Unable to 'up' VM!
[quantal] stdout: http://paste.ubuntu.com/6213133/
[quantal] stderr: http://paste.ubuntu.com/6213134/
[quantal] NOTE: unable to execute tests, marked as failed
[quantal] Destroying failed VM to reclaim resources
[quantal] Forcing shutdown of VM...
[quantal] Destroying VM and associated drives...
[raring] Bringing VM 'up'
[raring] (timing) 7.99user 3.67system 2:50.12elapsed 6%CPU (0avgtext+0avgdata 21156maxresident)k
[raring] (timing) 0inputs+120outputs (0major+216337minor)pagefaults 0swaps
[raring] Starting tests...
[raring] CheckBox test suite: PASS
[raring] (timing) 0.89user 0.29system 0:38.50elapsed 3%CPU (0avgtext+0avgdata 19700maxresident)k
[raring] (timing) 0inputs+48outputs (0major+47192minor)pagefaults 0swaps
[raring] (timing) 0.77user 0.27system 0:06.39elapsed 16%CPU (0avgtext+0avgdata 20144maxresident)k
[raring] (timing) 0inputs+16outputs (0major+47358minor)pagefaults 0swaps
[raring] PlainBox test suite: PASS
[raring] (timing) 1.01user 0.30system 0:19.66elapsed 6%CPU (0avgtext+0avgdata 20804maxresident)k
[raring] (timing) 0inputs+288outputs (0major+47594minor)pagefaults 0swaps
[raring] PlainBox documentation build: PASS
[raring] (timing) 0.78user 0.26system 0:31.39elapsed 3%CPU (0avgtext+0avgdata 20752maxresident)k
[raring] (timing) 0inputs+16outputs (0major+47350minor)pagefaults 0swaps
[raring] CheckBoxNG test suite: PASS
[raring] (timing) 0.78user 0.26system 0:06.86elapsed 15%CPU (0avgtext+0avgdata 20664maxresident)k
[raring] (timing) 0inputs+16outputs (0major+47445minor)pagefaults 0swaps
[raring] Integration tests: PASS
[raring] (timing) 0.71user 0.29system 0:07.61elapsed 13%CPU (0avgtext+0avgdata 19964maxresident)k
[raring] (timing) 0inputs+8outputs (0major+49614minor)pagefaults 0swaps
[raring] Destroying VM

[Sylvain Pineau (sylvain-pineau)]

Rapproving, please Tarmac, please...

=== modified file 'plainbox/plainbox/impl/highlevel.py'
--- plainbox/plainbox/impl/highlevel.py	2013-09-05 16:55:28 +0000
+++ plainbox/plainbox/impl/highlevel.py	2013-10-09 09:44:27 +0000
@@ -105,7 +105,7 @@
                 'outcome': IJobResult.OUTCOME_NOT_SUPPORTED,
                 'comments': job_state.get_readiness_description()
             })
-        if job_result is not None:
+        if job_result.outcome is not IJobResult.OUTCOME_UNDECIDED:
             running_job_wrapper.update_job_result_callback(job, job_result)
 
     # FIXME: broken layering, running_job_wrapper is from the dbus layer

=== modified file 'plainbox/plainbox/impl/service.py'
--- plainbox/plainbox/impl/service.py	2013-10-03 13:21:58 +0000
+++ plainbox/plainbox/impl/service.py	2013-10-09 09:44:27 +0000
@@ -41,7 +41,7 @@
 from plainbox.impl import dbus
 from plainbox.impl.dbus import OBJECT_MANAGER_IFACE
 from plainbox.impl.job import JobDefinition
-from plainbox.impl.result import DiskJobResult
+from plainbox.impl.result import DiskJobResult, MemoryJobResult
 from plainbox.impl.runner import JobRunner
 from plainbox.impl.session import JobState
 from plainbox.impl.signal import remove_signals_listeners
@@ -1254,6 +1254,7 @@
 
     def emitAskForOutcomeSignal(self, *args):
         self.AskForOutcome(self.path)
+        return MemoryJobResult({'outcome': IJobResult.OUTCOME_UNDECIDED})
 
     def emitJobResultAvailable(self, job, result):
         result_wrapper = JobResultWrapper(result)