test: Update test using ClientConfig

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>

Author: VietND96

tests/SeleniumTests/__init__.py

@@ -18,6 +18,7 @@
 SELENIUM_GRID_PORT = os.environ.get('SELENIUM_GRID_PORT', '4444')
 SELENIUM_GRID_USERNAME = os.environ.get('SELENIUM_GRID_USERNAME', None)
 SELENIUM_GRID_PASSWORD = os.environ.get('SELENIUM_GRID_PASSWORD', None)
+CHART_CERT_PATH = os.environ.get('CHART_CERT_PATH', None)
 SELENIUM_GRID_TEST_HEADLESS = os.environ.get('SELENIUM_GRID_TEST_HEADLESS', 'false').lower() == 'true'
 SELENIUM_ENABLE_MANAGED_DOWNLOADS = os.environ.get('SELENIUM_ENABLE_MANAGED_DOWNLOADS', 'true').lower() == 'true'
 WEB_DRIVER_WAIT_TIMEOUT = int(os.environ.get('WEB_DRIVER_WAIT_TIMEOUT', 60))
@@ -37,7 +38,8 @@
     keep_alive=True,
     timeout=3600,
     username=SELENIUM_GRID_USERNAME,
-    password=SELENIUM_GRID_PASSWORD
+    password=SELENIUM_GRID_PASSWORD,
+    ca_certs=CHART_CERT_PATH,
 )
 
 if TEST_NODE_RELAY == 'Android':
@@ -167,7 +169,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()
@@ -196,7 +198,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()
@@ -230,7 +232,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()

tests/bootstrap.sh

@@ -16,10 +16,6 @@ fi
 
 python3 -m pip install docker requests chardet | grep -v 'Requirement already satisfied'
 
-if [ "${SELENIUM_GRID_PROTOCOL}" = "https" ]; then
-  export REQUESTS_CA_BUNDLE="${CHART_CERT_PATH}"
-fi
-
 python3 test.py $1
 ret_code=$?
 

tests/charts/make/chart_test.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-mkdir -p tests/tests
+mkdir -p 775 tests/tests
 set -o xtrace
 
 echo "Set ENV variables"
@@ -127,7 +127,7 @@ if [ "${TEST_UPGRADE_CHART}" != "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}" !=
   envsubst < ${LOCAL_PVC_YAML} > ./tests/tests/local-pvc.yaml
   LOCAL_PVC_YAML=./tests/tests/local-pvc.yaml
   kubectl delete -n ${SELENIUM_NAMESPACE} -f ${LOCAL_PVC_YAML} --ignore-not-found=true
-  sudo rm -rf ${HOST_PATH}; sudo mkdir -p ${HOST_PATH}
+  sudo rm -rf ${HOST_PATH}; sudo mkdir -p 775 ${HOST_PATH}
   sudo chmod -R 777 ${HOST_PATH}
   kubectl create ns ${SELENIUM_NAMESPACE} || true
   kubectl apply -n ${SELENIUM_NAMESPACE} -f ${LOCAL_PVC_YAML}