From 670c658dc64f92a37f9a71c6e867418546f008f0 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 4 Oct 2020 19:47:01 +0100 Subject: [PATCH] Timing Cleanups --- api_test.py | 1 - full_run_rand.yaml | 1 - full_run_seq.yaml | 1 - media.yaml | 2 -- pause.yaml | 1 - play.yaml | 3 +-- stop.yaml | 3 +-- test.yaml | 1 - test_api/apitest/callbacks.py | 1 - test_api/apitest/runner.py | 5 +---- test_api/apitest/task.py | 3 +-- test_api/apitest/zero.py | 2 -- test_api/runner.py | 2 -- 13 files changed, 4 insertions(+), 22 deletions(-) diff --git a/api_test.py b/api_test.py index f76c2ac..0330c91 100755 --- a/api_test.py +++ b/api_test.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- # diff --git a/full_run_rand.yaml b/full_run_rand.yaml index 3f63c98..22ef6c2 100644 --- a/full_run_rand.yaml +++ b/full_run_rand.yaml @@ -82,5 +82,4 @@ step17: payload: plugin: bibles step18: - delay: 0.1 name: load_service_sequential diff --git a/full_run_seq.yaml b/full_run_seq.yaml index d0c00c6..e933108 100644 --- a/full_run_seq.yaml +++ b/full_run_seq.yaml @@ -82,5 +82,4 @@ step17: payload: plugin: bibles step18: - delay: 0.1 name: load_service_random diff --git a/media.yaml b/media.yaml index ce0a7c3..d2f40b5 100644 --- a/media.yaml +++ b/media.yaml @@ -13,11 +13,9 @@ step3: payload: plugin: media step4: - delay: 0.1 name: load_service_sequential step5: delay: 30 name: flush_pending step6: - delay: 0.2 name: media_pause diff --git a/pause.yaml b/pause.yaml index a384f73..0f5ba5d 100644 --- a/pause.yaml +++ b/pause.yaml @@ -1,5 +1,4 @@ --- process_name: Pause Media step1: - delay: 0.2 name: media_pause \ No newline at end of file diff --git a/play.yaml b/play.yaml index 41dd846..4d994c9 100644 --- a/play.yaml +++ b/play.yaml @@ -1,5 +1,4 @@ --- process_name: Play Media step1: - delay: 0.2 - name: media_play \ No newline at end of file + name: media_play diff --git a/stop.yaml b/stop.yaml index bdc8976..5e89126 100644 --- a/stop.yaml +++ b/stop.yaml @@ -1,5 +1,4 @@ --- process_name: Stop Media step1: - delay: 0.2 - name: media_stop \ No newline at end of file + name: media_stop diff --git a/test.yaml b/test.yaml index 60f1f57..91ad246 100644 --- a/test.yaml +++ b/test.yaml @@ -22,5 +22,4 @@ step5: payload: plugin: bibles step6: - delay: 0.1 name: load_service_sequential diff --git a/test_api/apitest/callbacks.py b/test_api/apitest/callbacks.py index df6d182..fafce50 100644 --- a/test_api/apitest/callbacks.py +++ b/test_api/apitest/callbacks.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- # diff --git a/test_api/apitest/runner.py b/test_api/apitest/runner.py index fd11a3b..429b156 100644 --- a/test_api/apitest/runner.py +++ b/test_api/apitest/runner.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- # @@ -26,8 +25,7 @@ import yaml from collections import deque from websocket import create_connection -from test_api.apitest.logger import print_error, print_ok, print_info -from test_api.apitest.logger import print_debug +from test_api.apitest.logger import print_error, print_ok, print_info, print_debug from test_api.apitest.callbacks import * # noqa E403 @@ -115,7 +113,6 @@ class RunTestsController(object): a = parser.parse_args() with open(a.rargs[0], 'r') as file: commands = yaml.load(file, Loader=yaml.FullLoader) - for step in commands: if step == 'process_name': print_info(f'Processing file {commands[step]}') diff --git a/test_api/apitest/task.py b/test_api/apitest/task.py index a586018..e9a4558 100644 --- a/test_api/apitest/task.py +++ b/test_api/apitest/task.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- # @@ -48,7 +47,7 @@ class Task(object): try: human_delay(self.request['delay']) except KeyError: - pass + human_delay(0.3) try: self.caller.check_websocket_changes(self.request['max'], self.request['min']) except KeyError: diff --git a/test_api/apitest/zero.py b/test_api/apitest/zero.py index 4cd318d..40369c0 100644 --- a/test_api/apitest/zero.py +++ b/test_api/apitest/zero.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- # diff --git a/test_api/runner.py b/test_api/runner.py index 0f9d214..f41ab70 100644 --- a/test_api/runner.py +++ b/test_api/runner.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python3 # -*- coding: utf-8 -*- - ########################################################################## # OpenLP - Open Source Lyrics Projection # # ---------------------------------------------------------------------- #