diff options
| author | Adam Misnyovszki <amisnyov@redhat.com> | 2014-03-25 14:47:03 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-04-09 13:45:32 +0200 |
| commit | 8b91d9a6e87412c36d4f1191abf15fcda0815c60 (patch) | |
| tree | e6af0204d22bd2c79ca8108434a14e5ea06a65b2 /ipatests/test_xmlrpc/xmlrpc_test.py | |
| parent | c58d6b2689acbfa36aec362b7de1ec7512d5f82a (diff) | |
| download | freeipa-8b91d9a6e87412c36d4f1191abf15fcda0815c60.tar.gz freeipa-8b91d9a6e87412c36d4f1191abf15fcda0815c60.tar.xz freeipa-8b91d9a6e87412c36d4f1191abf15fcda0815c60.zip | |
automember rebuild nowait feature added
automember-rebuild uses asynchronous 389 task, and returned
success even if the task didn't run. this patch fixes this
issue adding a --nowait parameter to 'ipa automember-rebuild',
defaulting to False, thus when the script runs without it,
it waits for the 'nstaskexitcode' attribute, which means
the task has finished. Old usage can be enabled using --nowait,
and returns the DN of the task for further polling.
New tests added also.
https://fedorahosted.org/freeipa/ticket/4239
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc/xmlrpc_test.py')
| -rw-r--r-- | ipatests/test_xmlrpc/xmlrpc_test.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py index 8f31a1ec0..a596cd69c 100644 --- a/ipatests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -38,6 +38,16 @@ uuid_re = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' # Matches an ipauniqueid like u'784d85fd-eae7-11de-9d01-54520012478b' fuzzy_uuid = Fuzzy('^%s$' % uuid_re) +# Matches an automember task DN +fuzzy_automember_dn = Fuzzy( + '^cn=%s,cn=automember rebuild membership,cn=tasks,cn=config$' % uuid_re +) + +# Matches an automember task finish message +fuzzy_automember_message = Fuzzy( + '^Automember rebuild task finished\. Processed \(\d+\) entries\.$' +) + # Matches trusted domain GUID, like u'463bf2be-3456-4a57-979e-120304f2a0eb' fuzzy_guid = fuzzy_uuid |