kafka-1078; Update System Test to handle controller data returned by ZK; patched by John Fung; reviewed by Jun Rao

This commit is contained in:
John Fung 2013-10-08 09:22:32 -07:00 committed by Jun Rao
parent f53fe18361
commit a6904a2644
1 changed files with 10 additions and 4 deletions

View File

@ -1878,10 +1878,16 @@ def get_controller_attributes(systemTestEnv, testcaseEnv):
logger.debug("executing command [" + cmdStr + "]", extra=d)
subproc = system_test_utils.sys_call_return_subproc(cmdStr)
for line in subproc.stdout.readlines():
brokerid = line.rstrip('\n')
controllerDict["brokerid"] = brokerid
controllerDict["entity_id"] = system_test_utils.get_data_by_lookup_keyval(
tcConfigsList, "broker.id", brokerid, "entity_id")
if "brokerid" in line:
json_str = line.rstrip('\n')
json_data = json.loads(json_str)
brokerid = str(json_data["brokerid"])
controllerDict["brokerid"] = brokerid
controllerDict["entity_id"] = system_test_utils.get_data_by_lookup_keyval(
tcConfigsList, "broker.id", brokerid, "entity_id")
else:
pass
return controllerDict
def getMinCommonStartingOffset(systemTestEnv, testcaseEnv, clusterName="source"):