harden e2e test by adding healthCheck (#10)
* harden e2e test by adding healthCheck
Signed-off-by: tison <wander4096@gmail.com>
* retrigger
Signed-off-by: tison <wander4096@gmail.com>
* retrigger
Signed-off-by: tison <wander4096@gmail.com>
* retrigger
Signed-off-by: tison <wander4096@gmail.com>
* move probe to the e2e script
Signed-off-by: tison <wander4096@gmail.com>
* trigger ci
Signed-off-by: tison <wander4096@gmail.com>
* trigger ci
Signed-off-by: tison <wander4096@gmail.com>
* make use of retry lib
Signed-off-by: tison <wander4096@gmail.com>
* trigger ci
Signed-off-by: tison <wander4096@gmail.com>
* trigger ci
Signed-off-by: tison <wander4096@gmail.com>
diff --git a/requirements.txt b/requirements.txt
index a8774cb..313885f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
PyYAML==5.4
apache-skywalking==0.5.0
+retry==0.9.2
diff --git a/tests/e2e/run_e2e.py b/tests/e2e/run_e2e.py
index cd2e1c9..a4f99a9 100644
--- a/tests/e2e/run_e2e.py
+++ b/tests/e2e/run_e2e.py
@@ -1,21 +1,19 @@
import os
import sys
-import time
from difflib import Differ
-from os.path import dirname
+from retry.api import retry_call
import argparse
import yaml
import requests
-import time
try:
from yaml import CSafeLoader as Loader
except ImportError:
from yaml import SafeLoader as Loader
-def validate(expected_file_name):
- with open(expected_file_name) as expected_data_file:
+def validate(excepted_file):
+ with open(excepted_file) as expected_data_file:
expected_data = os.linesep.join(expected_data_file.readlines())
response = requests.post(url='http://0.0.0.0:12800/dataValidate', data=expected_data)
@@ -35,6 +33,13 @@
return response
+def health_check():
+ requests.get('http://0.0.0.0:8081/healthCheck', timeout=5)
+
+def call_target_path(target_path):
+ requests.get('http://0.0.0.0:8081{0}'.format(target_path), timeout=5)
+
+
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument('--expected_file', help='File name which includes expected reported value')
@@ -43,19 +48,10 @@
args = parser.parse_args()
- retry_times = 0
- while True:
- if retry_times > args.max_retry_times:
- raise RuntimeError("Max retry times exceeded")
+ import logging
+ logging.basicConfig()
+ retry_call(health_check, tries=30, delay=2)
+ retry_call(call_target_path, fargs=[args.target_path], tries=args.max_retry_times, delay=2)
- try:
- requests.get('http://0.0.0.0:8081{0}'.format(args.target_path), timeout=5)
- except Exception as e:
- print(e)
- retry_times += 1
- time.sleep(2)
- continue
-
- res = validate(args.expected_file)
- assert res.status_code == 200
- break
+ res = validate(args.expected_file)
+ assert res.status_code == 200
