Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

Conflicts:

	func/overlord/client.py

2 files changed, 5 insertions, 1 deletions

diff --git a/test/async_test.py b/test/async_test.py
index 4c1acf5..cec512b 100644
--- a/test/async_test.py
+++ b/test/async_test.py
@@ -1,5 +1,5 @@
 from func.overlord.client import Client
-import func.overlord.jobthing as jobthing
+import func.jobthing as jobthing
 import time
 import sys
 
@@ -23,6 +23,9 @@ def __tester(async):
                sys.exit(1)
            if code == jobthing.JOB_ID_RUNNING:  
                print "task is still running, %s elapsed ..." % delta
+           if code == jobthing.JOB_ID_PARTIAL:
+               print "task reports partial status, %s elapsed, results = %s" % (delta, results)
+                   
            elif code == jobthing.JOB_ID_FINISHED:
                print "task complete, %s elapsed, results = %s" % (delta, results)
                sys.exit(0)
diff --git a/test/unittest/test_client.py b/test/unittest/test_client.py
index d5d0e73..b7c5e7b 100644
--- a/test/unittest/test_client.py
+++ b/test/unittest/test_client.py
@@ -6,6 +6,7 @@ import unittest
 import xmlrpclib
 
 import func.overlord.client as fc
+import socket