From abb07ed1e2bb3ef56e41c653c632df879a945e0f Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Sep 08 2016 16:19:04 +0000 Subject: [PATCH 1/2] Indentation Fix Checking Signed-off-by: Mohan Boddu --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 47582ee..dec31c3 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -72,26 +72,25 @@ def log_error(msg): class Task(object): """A task for the build hosts""" - fields = ( - ('task.id', 'id'), - ('task.state', 'state'), - ('task.create_time', 'create_time'), - ('EXTRACT(EPOCH FROM create_time)','create_ts'), - ('task.start_time', 'start_time'), - ('EXTRACT(EPOCH FROM task.start_time)', 'start_ts'), - ('task.completion_time', 'completion_time'), - ('EXTRACT(EPOCH FROM completion_time)','completion_ts'), - ('task.channel_id', 'channel_id'), - ('task.host_id', 'host_id'), - ('task.parent', 'parent'), - ('task.label', 'label'), - ('task.waiting', 'waiting'), - ('task.awaited', 'awaited'), - ('task.owner', 'owner'), - ('task.method', 'method'), - ('task.arch', 'arch'), - ('task.priority', 'priority'), - ('task.weight', 'weight')) + fields = (('task.id', 'id'), + ('task.state', 'state'), + ('task.create_time', 'create_time'), + ('EXTRACT(EPOCH FROM create_time)','create_ts'), + ('task.start_time', 'start_time'), + ('EXTRACT(EPOCH FROM task.start_time)', 'start_ts'), + ('task.completion_time', 'completion_time'), + ('EXTRACT(EPOCH FROM completion_time)','completion_ts'), + ('task.channel_id', 'channel_id'), + ('task.host_id', 'host_id'), + ('task.parent', 'parent'), + ('task.label', 'label'), + ('task.waiting', 'waiting'), + ('task.awaited', 'awaited'), + ('task.owner', 'owner'), + ('task.method', 'method'), + ('task.arch', 'arch'), + ('task.priority', 'priority'), + ('task.weight', 'weight')) def __init__(self,id): self.id = id @@ -160,12 +159,12 @@ class Task(object): if state == koji.TASK_STATES['FREE']: if otherhost is not None: log_error("Error: task %i is both free and locked (host %i)" - % (task_id,otherhost)) + % (task_id,otherhost)) return False elif state == koji.TASK_STATES['ASSIGNED']: if otherhost is None: log_error("Error: task %i is assigned, but has no assignee" - % (task_id)) + % (task_id)) return False elif otherhost != host_id: #task is assigned to someone else @@ -174,7 +173,7 @@ class Task(object): else: if otherhost is None: log_error("Error: task %i is non-free but unlocked (state %i)" - % (task_id,state)) + % (task_id,state)) return False #if we reach here, task is either # - free and unlocked @@ -204,7 +203,7 @@ class Task(object): # get more complete data to return fields = self.fields + (('task.request', 'request'),) query = QueryProcessor(tables=['task'], clauses=['id=%(id)i'], values=vars(self), - columns=[f[0] for f in fields], aliases=[f[1] for f in fields]) + columns=[f[0] for f in fields], aliases=[f[1] for f in fields]) ret = query.executeOne() if ret['request'].find(' %(event)i', 'tag_id IN %(taglist)s'] query = QueryProcessor(tables=['tag_updates'], columns=['id'], - clauses=clauses, values=data, - opts={'limit': 1}) + clauses=clauses, values=data, + opts={'limit': 1}) if query.execute(): return True #also check these versioned tables @@ -2477,7 +2476,7 @@ def tag_changed_since_event(event,taglist): 'tag_id IN %(taglist)s'] for table in tables: query = QueryProcessor(tables=[table], columns=['tag_id'], clauses=clauses, - values=data, opts={'limit': 1}) + values=data, opts={'limit': 1}) if query.execute(): return True return False @@ -2561,7 +2560,7 @@ def edit_build_target(buildTargetInfo, name, build_tag, dest_tag): _dml(rename, locals()) update = UpdateProcessor('build_target_config', values=locals(), - clauses=["build_target_id = %(buildTargetID)i"]) + clauses=["build_target_id = %(buildTargetID)i"]) update.make_revoke() insert = InsertProcessor('build_target_config') @@ -2585,7 +2584,7 @@ def delete_build_target(buildTargetInfo): #build targets are versioned, so we do not delete them from the db #instead we revoke the config entry update = UpdateProcessor('build_target_config', values=locals(), - clauses=["build_target_id = %(targetID)i"]) + clauses=["build_target_id = %(targetID)i"]) update.make_revoke() update.execute() @@ -2940,7 +2939,7 @@ def delete_tag(tagInfo): def _tagDelete(tableName, value, columnName='tag_id'): update = UpdateProcessor(tableName, clauses=["%s = %%(value)i" % columnName], - values={'value':value}) + values={'value':value}) update.make_revoke() update.execute() @@ -3051,7 +3050,7 @@ def edit_external_repo(info, name=None, url=None): url += '/' update = UpdateProcessor('external_repo_config', values=locals(), - clauses=['external_repo_id = %(repo_id)i']) + clauses=['external_repo_id = %(repo_id)i']) update.make_revoke() insert = InsertProcessor('external_repo_config') @@ -3074,7 +3073,7 @@ def delete_external_repo(info): repo_info=repo_id) update = UpdateProcessor('external_repo_config', values=locals(), - clauses=['external_repo_id = %(repo_id)i']) + clauses=['external_repo_id = %(repo_id)i']) update.make_revoke() update.execute() @@ -3116,7 +3115,7 @@ def remove_external_repo_from_tag(tag_info, repo_info): (repo['name'], tag['name']) update = UpdateProcessor('tag_external_repos', values=locals(), - clauses=["tag_id = %(tag_id)i", "external_repo_id = %(repo_id)i"]) + clauses=["tag_id = %(tag_id)i", "external_repo_id = %(repo_id)i"]) update.make_revoke() update.execute() @@ -3704,7 +3703,7 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos ('archivetypes.name', 'type_name'), ('archivetypes.description', 'type_description'), ('archivetypes.extensions', 'type_extensions'), - ] + ] clauses = [] if buildID is not None: @@ -3720,8 +3719,8 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos fields.append(['buildroot_archives.buildroot_id', 'component_buildroot_id']) fields.append(['buildroot_archives.project_dep', 'project']) if imageID != None: - clauses.append('image_archive_listing.image_id = %(imageID)i') - joins.append('image_archive_listing ON archiveinfo.id = image_archive_listing.archive_id') + clauses.append('image_archive_listing.image_id = %(imageID)i') + joins.append('image_archive_listing ON archiveinfo.id = image_archive_listing.archive_id') if hostID is not None: joins.append('standard_buildroot on archiveinfo.buildroot_id = standard_buildroot.buildroot_id') clauses.append('standard_buildroot.host_id = %(host_id)i') @@ -3741,11 +3740,10 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos pass elif type == 'maven': joins.append('maven_archives ON archiveinfo.id = maven_archives.archive_id') - fields.extend([ - ('maven_archives.group_id', 'group_id'), - ('maven_archives.artifact_id', 'artifact_id'), - ('maven_archives.version', 'version'), - ]) + fields.extend([('maven_archives.group_id', 'group_id'), + ('maven_archives.artifact_id', 'artifact_id'), + ('maven_archives.version', 'version'), + ]) if typeInfo: for key in ('group_id', 'artifact_id', 'version'): @@ -3754,11 +3752,10 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos values[key] = typeInfo[key] elif type == 'win': joins.append('win_archives ON archiveinfo.id = win_archives.archive_id') - fields.extend([ - ('win_archives.relpath', 'relpath'), - ('win_archives.platforms', 'platforms'), - ('win_archives.flags', 'flags'), - ]) + fields.extend([('win_archives.relpath', 'relpath'), + ('win_archives.platforms', 'platforms'), + ('win_archives.flags', 'flags'), + ]) if typeInfo: if 'relpath' in typeInfo: @@ -3782,8 +3779,8 @@ def list_archives(buildID=None, buildrootID=None, componentBuildrootID=None, hos columns, aliases = zip(*fields) ret = QueryProcessor(tables=tables, columns=columns, aliases=aliases, joins=joins, - transform=_fix_archive_row, - clauses=clauses, values=values, opts=queryOpts).execute() + transform=_fix_archive_row, + clauses=clauses, values=values, opts=queryOpts).execute() return ret @@ -3818,7 +3815,7 @@ def get_archive(archive_id, strict=False): fields = ('id', 'type_id', 'build_id', 'buildroot_id', 'filename', 'size', 'checksum', 'checksum_type', 'metadata_only', 'extra') archive = QueryProcessor(tables=['archiveinfo'], columns=fields, transform=_fix_archive_row, - clauses=['id=%(archive_id)s'], values=locals()).executeOne() + clauses=['id=%(archive_id)s'], values=locals()).executeOne() if not archive: # strict is taken care of by _singleRow() return None @@ -4453,11 +4450,10 @@ def new_build(data): data.setdefault('volume_id', 0) #check for existing build - query = QueryProcessor( - tables=['build'], columns=['id', 'state', 'task_id'], - clauses=['pkg_id=%(pkg_id)s', 'version=%(version)s', - 'release=%(release)s'], - values=data, opts={'rowlock':True, 'asList':True}) + query = QueryProcessor(tables=['build'], columns=['id', 'state', 'task_id'], + clauses=['pkg_id=%(pkg_id)s', 'version=%(version)s', + 'release=%(release)s'], + values=data, opts={'rowlock':True, 'asList':True}) row = query.executeOne() if row: build_id, state, task_id = row @@ -4613,7 +4609,7 @@ def import_rpm(fn, buildinfo=None, brootid=None, wrapper=False, fileinfo=None): #read rpm info hdr = koji.get_rpm_header(fn) rpminfo = koji.get_header_fields(hdr,['name','version','release','epoch', - 'sourcepackage','arch','buildtime','sourcerpm']) + 'sourcepackage','arch','buildtime','sourcerpm']) if rpminfo['sourcepackage'] == 1: rpminfo['arch'] = "src" @@ -4727,7 +4723,7 @@ class CG_Importer(object): self.assert_policy() koji.plugin.run_callbacks('preImport', type='cg', metadata=metadata, - directory=directory) + directory=directory) # finalize import self.get_build() @@ -4736,7 +4732,7 @@ class CG_Importer(object): self.import_metadata() koji.plugin.run_callbacks('postImport', type='cg', metadata=metadata, - directory=directory, buildinfo=self.buildinfo) + directory=directory, buildinfo=self.buildinfo) return self.buildinfo @@ -5017,7 +5013,7 @@ class CG_Importer(object): if key in extra: if l_type is not None: raise koji.GenericError("Output file has multiple archive" - "types: %(filename)s" % fileinfo) + "types: %(filename)s" % fileinfo) l_type = key type_info = extra[key] fileinfo['hub.l_type'] = l_type @@ -5679,14 +5675,14 @@ def import_archive_internal(filepath, buildinfo, type, typeInfo, buildroot_id=No # check against metadata if archiveinfo['size'] != fileinfo['filesize']: raise koji.GenericError("File size mismatch for %s: %s != %s" % - (filename, archiveinfo['size'], fileinfo['filesize'])) + (filename, archiveinfo['size'], fileinfo['filesize'])) if fileinfo['checksum_type'] != 'md5': # XXX # until we change the way we handle checksums, we have to limit this to md5 raise koji.GenericError("Unsupported checksum type: %(checksum_type)s" % fileinfo) if archiveinfo['checksum'] != fileinfo['checksum']: raise koji.GenericError("File checksum mismatch for %s: %s != %s" % - (filename, archiveinfo['checksum'], fileinfo['checksum'])) + (filename, archiveinfo['checksum'], fileinfo['checksum'])) archivetype = get_archive_type(filename, strict=True) archiveinfo['type_id'] = archivetype['id'] @@ -6052,8 +6048,7 @@ def query_history(tables=None, **kwargs): 'tag_external_repos' : ['tag_id', 'external_repo_id', 'priority'], 'tag_listing' : ['build_id', 'tag_id'], 'tag_packages' : ['package_id', 'tag_id', 'owner', 'blocked', 'extra_arches'], - 'group_config' : ['group_id', 'tag_id', 'blocked', 'exported', 'display_name', 'is_default', 'uservisible', - 'description', 'langonly', 'biarchonly'], + 'group_config' : ['group_id', 'tag_id', 'blocked', 'exported', 'display_name', 'is_default', 'uservisible','description', 'langonly', 'biarchonly'], 'group_req_listing' : ['group_id', 'tag_id', 'req_id', 'blocked', 'type', 'is_metapkg'], 'group_package_listing' : ['group_id', 'tag_id', 'package', 'blocked', 'type', 'basearchonly', 'requires'], } @@ -6267,12 +6262,12 @@ def tag_history(build=None, tag=None, package=None, active=None, queryOpts=None) 'EXTRACT(EPOCH FROM ev1.time)', 'EXTRACT(EPOCH FROM ev2.time)', 'maven_builds.build_id', 'win_builds.build_id') aliases = ('build_id', 'name', 'version', 'release', - 'tag_id', 'tag_name', 'active', - 'create_event', 'revoke_event', - 'creator_id', 'revoker_id', - 'creator_name', 'revoker_name', - 'create_ts', 'revoke_ts', - 'maven_build_id', 'win_build_id') + 'tag_id', 'tag_name', 'active', + 'create_event', 'revoke_event', + 'creator_id', 'revoker_id', + 'creator_name', 'revoker_name', + 'create_ts', 'revoke_ts', + 'maven_build_id', 'win_build_id') st_complete = koji.BUILD_STATES['COMPLETE'] tables = ['tag_listing'] joins = ["tag ON tag.id = tag_listing.tag_id", @@ -6433,12 +6428,11 @@ def build_references(build_id, limit=None): ret['images'].extend(image_ids) # find timestamp of most recent use in a buildroot - query = QueryProcessor( - columns=['standard_buildroot.create_event'], - tables=['buildroot_listing'], - joins=['standard_buildroot ON buildroot_listing.buildroot_id = standard_buildroot.buildroot_id'], - clauses=['buildroot_listing.rpm_id = %(rpm_id)s'], - opts={'order': '-standard_buildroot.create_event', 'limit': 1}) + query = QueryProcessor(columns=['standard_buildroot.create_event'], + tables=['buildroot_listing'], + joins=['standard_buildroot ON buildroot_listing.buildroot_id = standard_buildroot.buildroot_id'], + clauses=['buildroot_listing.rpm_id = %(rpm_id)s'], + opts={'order': '-standard_buildroot.create_event', 'limit': 1}) event_id = -1 for (rpm_id,) in rpm_ids: query.values={'rpm_id': rpm_id} @@ -6879,7 +6873,7 @@ def revoke_cg_access(user, cg): cg = lookup_name('content_generator', cg, strict=True) data = {'user_id': user['id'], 'cg_id' : cg['id']} update = UpdateProcessor('cg_users', values=data, - clauses=["user_id = %(user_id)i", "cg_id = %(cg_id)i"]) + clauses=["user_id = %(user_id)i", "cg_id = %(cg_id)i"]) update.make_revoke() update.execute() @@ -9522,7 +9516,7 @@ class RootExports(object): if perm['name'] not in koji.auth.get_user_perms(user_id): raise koji.GenericError, 'user %s does not have permission: %s' % (userinfo, perm['name']) update = UpdateProcessor('user_perms', values=locals(), - clauses=["user_id = %(user_id)i", "perm_id = %(perm_id)i"]) + clauses=["user_id = %(user_id)i", "perm_id = %(perm_id)i"]) update.make_revoke() update.execute() @@ -9765,12 +9759,10 @@ class RootExports(object): tables = ['task'] joins = ['users ON task.owner = users.id'] - flist = Task.fields + ( - ('task.request', 'request'), - ('task.result', 'result'), - ('users.name', 'owner_name'), - ('users.usertype', 'owner_type'), - ) + flist = Task.fields + (('task.request', 'request'), + ('task.result', 'result'), + ('users.name', 'owner_name'), + ('users.usertype', 'owner_type'),) fields = [f[0] for f in flist] aliases = [f[1] for f in flist] @@ -9805,17 +9797,15 @@ class RootExports(object): if opts.has_key('method'): conditions.append('method = %(method)s') - time_opts = [ - ['createdBefore', 'create_time', '<'], - ['createdAfter', 'create_time', '>'], - ['startedBefore', 'start_time', '<'], - ['startedAfter', 'start_time', '>'], - ['completeBefore', 'completion_time', '<'], - ['completeAfter', 'completion_time', '>'], - # and a couple aliases for api compat: - ['completedBefore', 'completion_time', '<'], - ['completedAfter', 'completion_time', '>'], - ] + time_opts = [['createdBefore', 'create_time', '<'], + ['createdAfter', 'create_time', '>'], + ['startedBefore', 'start_time', '<'], + ['startedAfter', 'start_time', '>'], + ['completeBefore', 'completion_time', '<'], + ['completeAfter', 'completion_time', '>'], + # and a couple aliases for api compat: + ['completedBefore', 'completion_time', '<'], + ['completedAfter', 'completion_time', '>'],] for key, field, cmp in time_opts: if opts.get(key) != None: value = opts[key] @@ -10367,8 +10357,8 @@ class BuildRoot(object): 'extra', ] query = QueryProcessor(columns=fields, tables=['buildroot'], - transform=_fix_extra_field, - values={'id': id}, clauses=['id=%(id)s']) + transform=_fix_extra_field, + values={'id': id}, clauses=['id=%(id)s']) data = query.executeOne() if not data: raise koji.GenericError, 'no buildroot with ID: %i' % id @@ -10389,7 +10379,7 @@ class BuildRoot(object): 'state', ] query = QueryProcessor(columns=fields, tables=['standard_buildroot'], - values={'id': self.id}, clauses=['buildroot_id=%(id)s']) + values={'id': self.id}, clauses=['buildroot_id=%(id)s']) data = query.executeOne() if not data: raise koji.GenericError, 'Not a standard buildroot: %i' % self.id @@ -10475,8 +10465,8 @@ class BuildRoot(object): #we do not re-init buildroots raise koji.GenericError, "Cannot change buildroot state to INIT" query = QueryProcessor(columns=['state', 'retire_event'], values=self.data, - tables=['standard_buildroot'], clauses=['buildroot_id=%(id)s'], - opts={'rowlock':True}) + tables=['standard_buildroot'], clauses=['buildroot_id=%(id)s'], + opts={'rowlock':True}) row = query.executeOne() if not row: raise koji.GenericError("Unable to get state for buildroot %s" % self.id) @@ -10513,10 +10503,10 @@ class BuildRoot(object): ('external_repo.name', 'external_repo_name'), ) query = QueryProcessor(columns=[f[0] for f in fields], aliases=[f[1] for f in fields], - tables=['buildroot_listing'], - joins=["rpminfo ON rpm_id = rpminfo.id", "external_repo ON external_repo_id = external_repo.id"], - clauses=["buildroot_listing.buildroot_id = %(brootid)i"], - values=locals()) + tables=['buildroot_listing'], + joins=["rpminfo ON rpm_id = rpminfo.id", "external_repo ON external_repo_id = external_repo.id"], + clauses=["buildroot_listing.buildroot_id = %(brootid)i"], + values=locals()) return query.execute() def _setList(self, rpmlist, update=False): @@ -10670,7 +10660,7 @@ class Host(object): update.execute() # clear awaited flag on any other child tasks update = UpdateProcessor('task', values=locals(), - clauses=['id NOT IN %(tasks)s', 'parent=%(parent)s', 'awaited=true']) + clauses=['id NOT IN %(tasks)s', 'parent=%(parent)s', 'awaited=true']) update.set(awaited=False) update.execute() else: @@ -11068,7 +11058,7 @@ class HostExports(object): scratchdir = koji.pathinfo.scratch() username = get_user(task.getOwner())['name'] destdir = os.path.join(scratchdir, username, - 'task_%s' % sub_results['task_id']) + 'task_%s' % sub_results['task_id']) for img in sub_results['files'] + sub_results['logs']: src = os.path.join(workdir, img) dest = os.path.join(destdir, img) @@ -11442,7 +11432,7 @@ class HostExports(object): if sub_results.has_key('rpmresults'): rpm_results = sub_results['rpmresults'] _import_wrapper(rpm_results['task_id'], - get_build(build_id, strict=True), rpm_results) + get_build(build_id, strict=True), rpm_results) def tagNotification(self, is_successful, tag_id, from_id, build_id, user_id, ignore_success=False, failure_msg=''): """Create a tag notification message. @@ -11615,10 +11605,9 @@ class HostExports(object): maven_info = entry['maven_info'] maven_label = koji.mavenLabel(maven_info) ignore_archives = ignore_by_label.get(maven_label, {}) - build_id = maven_build_index.get( - maven_info['group_id'], {}).get( - maven_info['artifact_id'], {}).get( - maven_info['version']) + build_id = maven_build_index.get(maven_info['group_id'], {}).get( + maven_info['artifact_id'], {}).get( + maven_info['version']) if not build_id: if not ignore_unknown: # just warn for now. might be in ignore list. the loop below will check. @@ -11862,8 +11851,8 @@ def handle_upload(environ): ret['hexdigest'] = chksum.hexdigest() logger.debug("Upload result: %r", ret) logger.info("Completed upload for session %s (#%s): %f seconds, %i bytes, %s", - context.session.id, context.session.callnum, - time.time()-start, size, fn) + context.session.id, context.session.callnum, + time.time()-start, size, fn) return ret #koji.add_sys_logger("koji") diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py index 5259175..eaa63ea 100644 --- a/hub/kojixmlrpc.py +++ b/hub/kojixmlrpc.py @@ -305,7 +305,7 @@ class ModXMLRPCRequestHandler(object): if self.logger.isEnabledFor(logging.INFO): self.logger.info("Handling method %s for session %s (#%s)", - method, context.session.id, context.session.callnum) + method, context.session.id, context.session.callnum) if method != 'uploadFile' and self.logger.isEnabledFor(logging.DEBUG): self.logger.debug("Params: %s", pprint.pformat(params)) self.logger.debug("Opts: %s", pprint.pformat(opts)) @@ -316,9 +316,9 @@ class ModXMLRPCRequestHandler(object): if self.logger.isEnabledFor(logging.INFO): rusage = resource.getrusage(resource.RUSAGE_SELF) self.logger.info("Completed method %s for session %s (#%s): %f seconds, rss %s, stime %f", - method, context.session.id, context.session.callnum, - time.time()-start, - rusage.ru_maxrss, rusage.ru_stime) + method, context.session.id, context.session.callnum, + time.time()-start, + rusage.ru_maxrss, rusage.ru_stime) return ret @@ -771,7 +771,7 @@ def application(environ, start_response): paramstr = paramstr[:117] + "..." h.logger.warning("Memory usage of process %d grew from %d KiB to %d KiB (+%d KiB) processing request %s with args %s" % (os.getpid(), memory_usage_at_start, memory_usage_at_end, memory_usage_at_end - memory_usage_at_start, context.method, paramstr)) h.logger.debug("Returning %d bytes after %f seconds", len(response), - time.time() - start) + time.time() - start) finally: #make sure context gets cleaned up if hasattr(context,'cnx'): From 531ba91cdd4d7bb43fa5c6e82867f0bf612a7dab Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Sep 14 2016 16:43:23 +0000 Subject: [PATCH 2/2] Indentation Fixes Signed-off-by: Mohan Boddu --- diff --git a/koji/util.py b/koji/util.py index 7903979..594b415 100644 --- a/koji/util.py +++ b/koji/util.py @@ -491,7 +491,7 @@ class MavenConfigOptAdapter(object): """ MULTILINE = ['properties', 'envs'] MULTIVALUE = ['goals', 'profiles', 'packages', - 'jvm_options', 'maven_options', 'buildrequires'] + 'jvm_options', 'maven_options', 'buildrequires'] def __init__(self, conf, section): self._conf = conf diff --git a/tests/test_tasks.py b/tests/test_tasks.py index 92b1847..6da6083 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -578,13 +578,12 @@ class TasksTestCase(TestCase): temp_path = get_tmp_dir_path('TestTask') makedirs(temp_path) - repo_dict = { - 'create_event': 13413120, - 'create_ts': 1466140834.9119599, - 'creation_time': '2016-06-17 05:20:34.911962', - 'id': 1592850, - 'state': 1 - } + repo_dict = {'create_event': 13413120, + 'create_ts': 1466140834.9119599, + 'creation_time': '2016-06-17 05:20:34.911962', + 'id': 1592850, + 'state': 1 + } obj = TestTask(123, 'some_method', ['random_arg'], None, None, temp_path) obj.session = Mock() @@ -607,7 +606,7 @@ class TasksTestCase(TestCase): 'dest_tag_name': 'dist-6E-dsrv-9-qu-candidate', 'id': 851, 'name': 'dist-6E-dsrv-9-qu-candidate' - }] + }] obj.session.host.subtask.return_value = 123 mock_wait.return_value = {123: repo_dict}