X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Finput_data_parser.py;h=ef661a8395b5dbe1478fd23854c99076354ed6b8;hb=refs%2Fchanges%2F33%2F20933%2F1;hp=6da428e1bbe0f1e2e829189c83ffd7570d9eea7e;hpb=52ebb67e52800f4240001d117d56d08d78a84d6a;p=csit.git diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 6da428e1bb..ef661a8395 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -1331,47 +1331,48 @@ class InputData(object): for job, builds in self._cfg.builds.items(): for build in builds: - work_queue.put((job, build, repeat)) - - work_queue.join() - - logging.info("Done.") - - logging.info("Collecting data:") - - while not data_queue.empty(): - - try: - result = data_queue.get() - - job = result["job"] - build_nr = result["build"]["build"] - - logging.info(" {job}-{build}".format(job=job, build=build_nr)) - - if result["data"]: - data = result["data"] - build_data = pd.Series({ - "metadata": pd.Series(data["metadata"].values(), - index=data["metadata"].keys()), - "suites": pd.Series(data["suites"].values(), - index=data["suites"].keys()), - "tests": pd.Series(data["tests"].values(), - index=data["tests"].keys())}) - - if self._input_data.get(job, None) is None: - self._input_data[job] = pd.Series() - self._input_data[job][str(build_nr)] = build_data + try: + work_queue.put((job, build, repeat)) + except (MemoryError, EOFError) as err: + logging.error(repr(err)) - self._cfg.set_input_file_name(job, build_nr, - result["build"]["file-name"]) + work_queue.join() - self._cfg.set_input_state(job, build_nr, result["state"]) + logging.info("Done.") - except (MemoryError, EOFError) as err: - logging.error(repr(err)) - raise + logging.info("Collecting data:") + while not data_queue.empty(): + try: + result = data_queue.get() + + job = result["job"] + build_nr = result["build"]["build"] + + logging.info(" {job}-{build}".format(job=job, + build=build_nr)) + if result["data"]: + data = result["data"] + build_data = pd.Series({ + "metadata": pd.Series( + data["metadata"].values(), + index=data["metadata"].keys()), + "suites": pd.Series(data["suites"].values(), + index=data["suites"].keys()), + "tests": pd.Series(data["tests"].values(), + index=data["tests"].keys())}) + + if self._input_data.get(job, None) is None: + self._input_data[job] = pd.Series() + self._input_data[job][str(build_nr)] = build_data + + self._cfg.set_input_file_name( + job, build_nr, result["build"]["file-name"]) + + self._cfg.set_input_state(job, build_nr, result["state"]) + + except (MemoryError, EOFError) as err: + logging.error(repr(err)) del data_queue