summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-01-24 16:00:12 -0500
committerMichael DeHaan <mdehaan@redhat.com>2008-01-24 16:00:12 -0500
commit47ea5b60cfe9de1062c303707cd801b00fbecbc3 (patch)
treed9bb668fb6b193aa7bdf47cece272939c21d5811
parent86c80167b3df69cb7b21574c36f512bf3f16daf1 (diff)
downloadthird_party-func-47ea5b60cfe9de1062c303707cd801b00fbecbc3.tar.gz
third_party-func-47ea5b60cfe9de1062c303707cd801b00fbecbc3.tar.xz
third_party-func-47ea5b60cfe9de1062c303707cd801b00fbecbc3.zip
Fixup to client noglobs invocation.
-rwxr-xr-xfunc/overlord/client.py5
-rw-r--r--test/async_test.py8
2 files changed, 6 insertions, 7 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py
index a848cb8..f33bc4b 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -265,9 +265,8 @@ class Client(object):
else:
# globbing is not being used, but still need to make sure
# URI is well formed.
- results = process_server(0, 0, self.servers)
- #expanded = expand_servers(self.server_spec, port=self.port, noglobs=True, verbose=self.verbose)[0]
-# results = process_server(0, 0, expanded)
+ expanded = expand_servers(self.server_spec, port=self.port, noglobs=True, verbose=self.verbose)[0]
+ results = process_server(0, 0, expanded)
return results
diff --git a/test/async_test.py b/test/async_test.py
index 4c99a56..9f70598 100644
--- a/test/async_test.py
+++ b/test/async_test.py
@@ -12,10 +12,10 @@ def __tester(async):
oldtime = time.time()
print "asking minion to sleep for %s seconds" % TEST_SLEEP
- # job_id = client.test.sleep(TEST_SLEEP)
- job_id = client.hardware.info()
- # job_id = client.test.explode()
- # job_id = client.test.does_not_exist(1,2)
+ # job_id = client.test.sleep(TEST_SLEEP) # ok
+ # job_id = client.hardware.info() # ok
+ # job_id = client.test.explode() # doesn't work yet
+ job_id = client.test.does_not_exist(1,2) # ditto
print "job_id = %s" % job_id
while True: