fix if statements

Author: yifanyang

ci/fireci/fireciplugins/macrobenchmark/analyze/aggregator.py

@@ -46,7 +46,7 @@ def mapper(quantile: float) -> str: return f'p{int(quantile * 100)}'
   dispersions = pd.DataFrame([pd.Series(cv, name='cv'), pd.Series(rmad, name='rmad')])
 
   # Optionally save percentiles and dispersions to file
-  if output_dir is not None:
+  if output_dir:
     percentiles.to_json(output_dir.joinpath('percentiles.json'), orient='index')
     dispersions.to_json(output_dir.joinpath('dispersions.json'), orient='index')
     logger.info(f'Percentiles and dispersions saved in: {output_dir}')
@@ -73,8 +73,7 @@ def calculate_statistic_diff(
   percentage = delta / ctl_mean
 
   # Optionally save statistics to file
-  if output_dir is not None:
+  if output_dir:
     delta.to_json(output_dir.joinpath('delta.json'))
     percentage.to_json(output_dir.joinpath('percentage.json'))
     logger.info(f'Percentiles diff saved in: {output_dir}')
-

ci/fireci/fireciplugins/macrobenchmark/analyze/analyzer.py

@@ -38,7 +38,7 @@ def start(
 ):
   logger.info('Starting to analyze macrobenchmark test results ...')
 
-  if output_dir is None:
+  if not output_dir:
     output_dir = Path(tempfile.mkdtemp(prefix='macrobenchmark-analysis-'))
     logger.info(f'Created temporary dir "{output_dir}" to save analysis results')
 

ci/fireci/fireciplugins/macrobenchmark/analyze/utils.py

@@ -28,12 +28,12 @@
 
 
 def collect_data_points(ftl_results_dir: list[str], local_reports_dir: Path) -> list[DataPoint]:
-  if not ftl_results_dir and local_reports_dir is None:
+  if not ftl_results_dir and not local_reports_dir:
     raise ClickException('Neither ftl-results-dir or local-reports-dir is provided.')
-  elif ftl_results_dir and local_reports_dir is None:
+  elif ftl_results_dir and not local_reports_dir:
     temp_dir = _download(ftl_results_dir)
     return _extract_raw_data(temp_dir)
-  elif not ftl_results_dir and local_reports_dir is not None:
+  elif not ftl_results_dir and local_reports_dir:
     return _extract_raw_data(local_reports_dir)
   else:
     raise ClickException('Should specify either ftl-results-dir or local-reports-dir, not both.')