测试代码

amazingcoderpro · amazingcoderpro · commit 907677d52c6f · 2019-05-05T10:01:52.000+08:00
diff --git a/task_service/db/dao.py b/task_service/db/dao.py
@@ -628,7 +628,6 @@ def init_db_data():
     # TaskOpt.save_task(category_id=3, creator_id=1, scheduler_id=2, account_ids=[1, 2, 4, 9], name=u'thumb', limit_counts=5)
     #
 
-
     AgentOpt.save_agent(1, status=-1)
     AgentOpt.save_agent(2, status=0)
     AgentOpt.save_agent(3, status=2)
diff --git a/task_service/executor/facebook/pc_actions.py b/task_service/executor/facebook/pc_actions.py
@@ -255,55 +255,28 @@ def post_status(self, contents):
         """
 
         try:
-            logger.info("发送状态功能: contents={},".format(contents,))
-            message_url = "https://www.facebook.com/home.php?sk=h_chr&ref=bookmarks"
-            self.driver.get(message_url)
+
+            logger.info("发送状态功能: contents={},".format(contents, ))
 
             # 检查发送状态的页面存在
             send_state = WebDriverWait(self.driver, 3).until(
-                EC.presence_of_all_elements_located((By.CSS_SELECTOR, 'div[class="linkWrap noCount"]')))
+                EC.presence_of_all_elements_located((By.CSS_SELECTOR, 'textarea')))
             if not send_state:
                 logger.warning("发送状态功能: 没有进入到个人中心页面")
                 return False, -1
-
-            # 查找输入框单击弹出消息框
-            time.sleep(2)
-            send_state_page = self.driver.find_element_by_css_selector('div[id="feedx_sprouts_container"]')
-            self.click(send_state_page)
-            # 输入需要发送的文本
-            time.sleep(1)
-
-            # 找到输入框的对象
-            message_info = self.driver.find_elements_by_xpath('//div[@role="presentation"]')
-            for item in message_info:
-                if "What\'s on your mind" in item.text:
-                    div_info = item.find_elements_by_css_selector('div')
-                    for row in div_info:
-                        try:
-                            if "What's on your mind" in row.text:
-                                try:
-                                    row.send_keys(contents)
-                                    # self.send_keys(row,contents)
-                                except Exception as e:
-                                    continue
-                                else:
-                                    message_instance = row
-                                    break
-                        except:
-                            continue
-                    break
-
-            time.sleep(1)
-            submit = None
-            for i in message_info:
-                try:
-                    submit = i.find_element_by_css_selector('button[type="submit"]')
+            self.sleep()
+            textarea = self.driver.find_element_by_css_selector('textarea')
+            # self.send_keys(textarea, contents)
+            self.sleep()
+            textarea.send_keys(contents)
+            self.sleep()
+            # 选择share
+            share_list = self.driver.find_elements_by_css_selector('button[type="submit"] span')
+            for row in share_list:
+                if row.text and row.text == "Share":
+                    row.click()
+                    self.sleep()
                     break
-                except:
-                    continue
-            time.sleep(2)
-            self.click(submit)
-
             self.driver.get(self.start_url)
             time.sleep(5)
             return True, 0
@@ -396,11 +369,17 @@ def browse_page(self, browse_times=0, distance=0, interval=0, back_top=True):
             # 增加好友
             # fma.add_friends(["James","Jolin"], 2)
             # 发送状态
+
             fma.post_status("Today is a sun day!")
+
+            #fma.post_status("Jesus conquered death, so that through him, we can conquer life. Happy Easter!")
             # 用户中心浏览
             # fma.browse_user_center()
             # 好友聊天
             # fma.chat(contents=["Hello", "Hi", "you good"], friends=2)
+
+            #fma.chat(contents=["Hello", "Hi", "you good"], friends=2)
+
             #
             break
 
diff --git a/task_service/tasks/tasks.py b/task_service/tasks/tasks.py
@@ -48,6 +48,7 @@ def fb_auto_feed(self, inputs):
         last_post = None
         last_add_friend = None
         cookies = None
+        fb_actions = None
         tsk_hlp = TaskHelper(inputs)
 
         if not tsk_hlp.is_inputs_valid():
@@ -77,7 +78,7 @@ def fb_auto_feed(self, inputs):
 
         # 分步执行任务
         # 启动浏览器
-        ret = fb_actions.start_chrome()
+        ret = fb_actions.start_chrome(force_display=True)
         if not ret:
             logger.error('start chrome failed.')
             return tsk_hlp.make_result()
@@ -159,7 +160,8 @@ def fb_auto_feed(self, inputs):
         # self.retry(countdown=10 ** self.request.retries)
         return tsk_hlp.make_result(err_msg=err_msg)
     finally:
-        fb_actions.quit()
+        if fb_actions:
+            fb_actions.quit()
     return tsk_hlp.make_result(True, last_login=last_login, last_chat=last_chat,
                                last_post=last_post, last_add_friend=last_add_friend, cookies=cookies)
 

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,6 @@ def init_db_data():`
`628`	`628`	`# TaskOpt.save_task(category_id=3, creator_id=1, scheduler_id=2, account_ids=[1, 2, 4, 9], name=u'thumb', limit_counts=5)`
`629`	`629`	`#`
`630`	`630`
`631`		`-`
`632`	`631`	`AgentOpt.save_agent(1, status=-1)`
`633`	`632`	`AgentOpt.save_agent(2, status=0)`
`634`	`633`	`AgentOpt.save_agent(3, status=2)`