|
@@ -24,13 +24,12 @@ class MetrologTester():
|
|
|
self.pgw_2 = PortgwTcp(ip, self.PGW_PORT_2)
|
|
|
self.pgw_3 = PortgwTcp(ip, self.PGW_PORT_3)
|
|
|
|
|
|
- self.pgw_1_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_1, ))
|
|
|
- self.pgw_2_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_2, ))
|
|
|
- self.pgw_3_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_3, ))
|
|
|
+ self.pgw_1_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_1, ), daemon=True)
|
|
|
+ self.pgw_2_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_2, ), daemon=True)
|
|
|
+ self.pgw_3_thread = threading.Thread(target=self.portgw_sender, args=(self.pgw_3, ), daemon=True)
|
|
|
|
|
|
self.ip = ip
|
|
|
- self.driver = webdriver.Firefox()
|
|
|
- self.web_thread = threading.Thread(target=self.test_page_click)
|
|
|
+ self.web_thread = threading.Thread(target=self.test_page_click, daemon=True)
|
|
|
|
|
|
def connect(self):
|
|
|
self.driver.get('http://' + self.ip)
|
|
@@ -43,6 +42,7 @@ class MetrologTester():
|
|
|
return True if self.driver.title == "Состояние модема" else False
|
|
|
|
|
|
def test_page_click(self):
|
|
|
+ self.driver = webdriver.Firefox()
|
|
|
self.connect()
|
|
|
while True:
|
|
|
if self.login() == False:
|
|
@@ -87,14 +87,15 @@ class MetrologTester():
|
|
|
|
|
|
|
|
|
def metrolog():
|
|
|
- robot = MetrologTester('192.168.31.230')
|
|
|
+ robot = MetrologTester('192.168.30.154')
|
|
|
robot.start_pgw_sender([0, 1, 1])
|
|
|
- robot.start_web_clicker()
|
|
|
+ # robot.start_web_clicker()
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
metrolog()
|
|
|
-
|
|
|
+ while True:
|
|
|
+ time.sleep(1)
|
|
|
|
|
|
|