From c9d3642e6ab992a01382d69057afb93c733d9a3d Mon Sep 17 00:00:00 2001 From: yangdsh Date: Mon, 25 May 2020 16:02:43 +0000 Subject: [PATCH] address Bohan's comment --- client/driver/fabfile.py | 7 ++++++- server/website/website/views.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/driver/fabfile.py b/client/driver/fabfile.py index 4dde052..06e264a 100644 --- a/client/driver/fabfile.py +++ b/client/driver/fabfile.py @@ -1068,7 +1068,7 @@ def integration_tests(): # periodic tasks haven't ran, lhs result returns. LOG.info('Test no pipeline data, LHS returned') - upload_result(result_dir='./integrationTests/data/', prefix='0__', + upload_result(result_dir='./integrationTests/data/', prefix='1__', upload_code='ottertuneTestTuningGPR') response = get_result(upload_code='ottertuneTestTuningGPR') assert response['status'] == 'lhs' @@ -1119,3 +1119,8 @@ def integration_tests(): average += gain / first_n elif i > total_n - last_n + 2: assert gain > average + + LOG.info("\n\nIntegration Tests: PASSED!!\n") + + # Test task status UI + task_status_ui_test() diff --git a/server/website/website/views.py b/server/website/website/views.py index b0c6b7f..2242283 100644 --- a/server/website/website/views.py +++ b/server/website/website/views.py @@ -1784,7 +1784,7 @@ def alt_create_or_edit_session(request): @csrf_exempt def pipeline_data_ready(request): # pylint: disable=unused-argument LOG.debug("Latest pipeline run: %s", PipelineRun.objects.get_latest()) - newest_result = Result.objects.filter().order_by('-pk')[0] + newest_result = Result.objects.order_by('-pk')[0] pipeline_data = PipelineData.objects.filter(workload=newest_result.workload).order_by('-pk') if pipeline_data.exists() and pipeline_data[0].pipeline_run.end_time is not None: response = "Pipeline data ready: True"