| commit | e11488ac9291519bbc7ae0213224ba50a3295161 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri May 30 02:50:09 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri May 30 02:50:09 2014 +0000 |
| tree | 9a3dc32d38e4fd4d538598b831801bf17c760f6f | |
| parent | ab5a8bdf9e2e8d61e9862ea3d33381206168ec98 [diff] | |
| parent | ec6ed8186469b7a210b59603be561e3f60e83171 [diff] |
Merge "allow 'main' as valid name for find_test_caller"
diff --git a/tempest/common/utils/misc.py b/tempest/common/utils/misc.py index b9f411b..0d78273 100644 --- a/tempest/common/utils/misc.py +++ b/tempest/common/utils/misc.py
@@ -60,6 +60,9 @@ break elif re.search("^_run_cleanup", name): is_cleanup = True + elif name == 'main': + caller_name = 'main' + break else: cname = "" if 'self' in frame.f_locals: