summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-10 14:17:38 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-10 14:17:38 -0400
commit76996c8ac3016389fdafb47e7791f2c636e2a4ed (patch)
treed244b1655283d498d5228565eea98e32d6d06355 /test
parent59fb48805b4a9e1ebe088d0b8d5853dd3af8d5b1 (diff)
parent3750980ea547c73a63cb456a85be0b14cc36c30c (diff)
downloadthird_party-func-76996c8ac3016389fdafb47e7791f2c636e2a4ed.tar.gz
third_party-func-76996c8ac3016389fdafb47e7791f2c636e2a4ed.tar.xz
third_party-func-76996c8ac3016389fdafb47e7791f2c636e2a4ed.zip
Merge branch 'kadamski-async2'
Conflicts: func/jobthing.py
Diffstat (limited to 'test')
-rw-r--r--test/async_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/async_test.py b/test/async_test.py
index 8e6961d..8e0495f 100644
--- a/test/async_test.py
+++ b/test/async_test.py
@@ -44,12 +44,12 @@ def __tester(async,test):
return
if code == jobthing.JOB_ID_RUNNING:
print "task is still running, %s elapsed ..." % delta
- elif code == jobthing.JOB_ID_ASYNC_PARTIAL:
+ elif code == jobthing.JOB_ID_PARTIAL:
print "task reports partial status, %s elapsed, results = %s" % (delta, results)
elif code == jobthing.JOB_ID_FINISHED:
print "(non-async) task complete, %s elapsed, results = %s" % (delta, results)
return
- elif code == jobthing.JOB_ID_ASYNC_FINISHED:
+ elif code == jobthing.JOB_ID_FINISHED:
print "(async) task complete, %s elapsed, results = %s" % (delta, results)
return
else: