Merge branch 'feature/playwright' of bitbucket.org:panleicim/appointement_modem_pool into feature/playwright

commandor_page.py

@@ -54,7 +54,7 @@ class CommandorPage:
             self._setName(contact.last_name, contact.first_name)
             self._set_email(contact.mail)
             self.setIdNumber(contact.passport)
-            self.checkCgu()
+            self._checkCgu()
             # wait for sms_code field
             self.clickOnValidBtn()
             # self.page.goto("file:///Users/lpan/Downloads/input_otp.html")
@@ -62,7 +62,7 @@ class CommandorPage:
             otp_input.wait_for(state='visible')
             on_ready_for_otp(e, self)
             event_is_set = e.wait()
-            logging.debug('event set: %s', event_is_set)
+            logging.info('event set: %s', event_is_set)
             self.fill_otp(self.otp_value)
             self.clickOnValidBtn()
             otp_sent = self.page.locator(MESSAGE_FIELD_CLASS)
@@ -114,7 +114,7 @@ class CommandorPage:
     def setIdNumber(self, id):
         self.page.evaluate(""" (id) => document.getElementById("passport_id").value = id""", id)
 
-    def checkCgu(self):
+    def _checkCgu(self):
         self.page.evaluate("""document.getElementById("cgu").checked = true;
     document.getElementById("processing").checked = true""")
 
@@ -128,7 +128,7 @@ class CommandorPage:
         self.page.fill(OTP_FIELD_ID, otp)
 
     def reset_air_plan_mode(self):
-        print("will close ")
+        print("will close browser")
         self.browser.close()
 
     def publish_message_to_queue(self, contact: ContactPojo, message: str, url: str):

main.py

@@ -11,7 +11,6 @@ from gsmmodem import GsmModem
 import params
 from commandor_page import CommandorPage, get_random_id_number_for_proxy
 from logs.AppLogging import init_logger
-from logs.LogSender import LOG_APPOINTMENT_TIMEOUT
 from modems.ModemPool import ModemPool
 from modems.card_pool import CardPool
 from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager, oracle_log_sender
@@ -195,7 +194,7 @@ def start_book():
                     signal = modem.modem.signalStrength
                     logger.info("信号强度: " + str(signal))
                     PROXY_USERNAME = "panleicim-cc-fr-sid-" + get_random_id_number_for_proxy()
-                    print("proxy_username is " + PROXY_USERNAME)
+                    logger.info("proxy_username is " + PROXY_USERNAME)
                     proxy = {
                         "server": params.PROXY_SERVER,
                         "username": PROXY_USERNAME,
@@ -215,4 +214,3 @@ if __name__ == '__main__':
     logger.addHandler(logging.StreamHandler(stream=sys.stdout))
     start_listen()
     start_book()
-    # card_pool.switch_to_slot(12)