[U] update 修改了整个结构

Author: Vant Ling

config/__init__.py data/__init__.py

@@ -2,7 +2,3 @@ login:
   username : admin
   password : 111111
 
-login:
-  face_url : 'http://www.*****'
-
-

config/browser.yaml data/browser.yaml

@@ -712,7 +712,7 @@ def __init__(self, stream=sys.stdout, verbosity=1, title=None, description=None)
         self.startTime = datetime.datetime.now()
 
     def run(self, test):
-        "Run the given test case or test suite."
+        "Run the given test testcase or test suite."
         result = _TestResult(self.verbosity)
         test(result)
         self.stopTime = datetime.datetime.now()

test/JieKou/interface.yaml data/element.yaml

@@ -10,7 +10,7 @@
 
 def create_suite():
     TestSuite = unittest.TestSuite()  # 测试集
-    test_dir = './test/case'
+    test_dir = './test/testcase'
     # print(test_dir)
 
     discover = unittest.defaultTestLoader.discover(

test/case/logs/test.log data/requests.yaml

@@ -3,10 +3,8 @@
 # @Author  : Vant
 # @Email   : 944921374@qq.com
 
-import os.path
 from selenium import webdriver
 from utils.logger import Logger
-import yaml
 from selenium.webdriver.chrome.options import Options
 from utils.config import Config
 
@@ -46,7 +44,7 @@ def openbrowser(self,driver):
             # driver = webdriver.Chrome() #用于linux系统加载驱动使用
             logger.info("启动谷歌浏览器")
         elif browser == "IE":
-            driver = webdriver.Ie(self.ie_driver_path)
+            driver = webdriver.Ie(self.c.driver_ptah())
             logger.info("启动IE浏览器")
 
         driver.get(url)

test/case/case.yaml data/testcase.yaml

@@ -3,13 +3,11 @@
 # @Author  : Vant
 # @Email   : 944921374@qq.com
 
-from selenium import webdriver
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.support.select import Select
 from selenium.common.exceptions import * #导入所有的异常类
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
-import os.path
 from utils.logger import Logger
 import time
 from utils.config import *

report/HTMLTestRunner3.py

@@ -8,14 +8,14 @@
 class MysqlLib(object):
     def __init__(self, ip, user, password, db_name, charset='utf8'):
         try:
-            self.ip = ip
+            self.ip1 = ip
             self.user = user
             self.password = password
             self.db_name = db_name
             self.char = charset
 
             self.MySQL_db = pymysql.connect(
-                host=self.ip,
+                host=self.ip1,
                 user=self.user,
                 password=self.password,
                 db=self.db_name,
@@ -148,7 +148,7 @@ def alter_sql(self,which,value):
 
 if __name__ == '__main__':
 
-    p = ['localhost','root','password','test']
+    p = ['127.0.0.1','root','','autotest']
     test = MysqlLib(p[0], p[1], p[2], p[3])
     print(test)
     # print(test.into_sql())
@@ -157,4 +157,4 @@ def alter_sql(self,which,value):
     # print(test.query_ont_sql("student",'02'))
     # print(test.update_sql('student','hel8o','03'))
     # print(test.del_sql('student','03'))
-    print(test.alter_sql('student','eng_name'))
+    # print(test.alter_sql('student','eng_name'))

run.py

@@ -4,7 +4,7 @@
 # @Email   : 944921374@qq.com
 
 from selenium.webdriver.common.by import By
-from test.common.Selenium2 import BasePage
+from test.common.Seleniums import BasePage
 import sys
 sys.path.append('../')
 class BaiduPage(BasePage):

test/case/.pytest_cache/v/cache/lastfailed

@@ -5,7 +5,7 @@
 from utils.config import Config
 
 
-class get_token:
+class get_login_token:
     c = Config()
     username = c.get_case_data('login').get('username')
     password = c.get_case_data('login').get('password')
@@ -24,5 +24,5 @@ def login_token(self):
             return False
 
 if __name__ == '__main__':
-    c = get_token()
+    c = get_login_token()
     print(c.login_token())

test/case/.pytest_cache/v/cache/nodeids

@@ -9,7 +9,7 @@
 import sys
 sys.path.append('../')
 from test.page.BaiduPage import BaiduPage
-from test.case.case_modle import *
+from test.testcase.case_modle import *
 from test.common.BrowserDriver import BrowserDriver
 
 class BaiduCase(model):

test/case/Autolt/test1.exe

@@ -4,29 +4,30 @@
 读取配置。这里配置文件用的yaml，也可用其他如XML,INI等，需在file_reader中添加相应的Reader进行处理。
 """
 import os
-from utils.file_read import YamlReader
+from utils.readFile import YamlReader
 
 # 通过当前文件的绝对路径，其父级目录一定是框架的base目录，然后确定各层的绝对路径。如果你的结构不同，可自行修改。
 BASE_PATH = os.path.split(os.path.dirname(os.path.abspath(__file__)))[0]
-CONFIG_FILE = os.path.join(BASE_PATH, 'config', 'browser.yaml')
+CONFIG_FILE = os.path.join(BASE_PATH, 'data', 'browser.yaml')
+# print(CONFIG_FILE)
+ELEMENT_PATH = os.path.join(BASE_PATH,'data','elements.yaml')
+CASE_PATH = os.path.join(BASE_PATH,'data','testcase.yaml')
+INTERFACE_PATH = os.path.join(BASE_PATH,'data','interface.yaml')
 DATA_PATH = os.path.join(BASE_PATH, 'data')
 DRIVER_PATH = os.path.join(BASE_PATH, 'drivers','chromedriver.exe')
 LOG_PATH = os.path.join(BASE_PATH, 'logs')
 REPORT_PATH = os.path.join(BASE_PATH, 'report')
 SCREENSHOTS_PATH = os.path.join(BASE_PATH,"screenshots",'')
-
-ELEMENT_PATH = os.path.join(BASE_PATH,'test','page','elements.yaml')
-CASE_PATH = os.path.join(BASE_PATH,'test','case','case.yaml')
-INTERFACE_PATH = os.path.join(BASE_PATH,'test','JieKou','interface.yaml')
 EXE_PATH = os.path.join(BASE_PATH,'test','Autolt','test1.jpg')
-EXCEL_PATH = os.path.join(BASE_PATH,'test','sqlconf','')
+EXCEL_PATH = os.path.join(BASE_PATH,'test','configSQL','')
 
 
 class Config:
     def __init__(self, config=CONFIG_FILE,element = ELEMENT_PATH,case_data = CASE_PATH,
                  interface_data = INTERFACE_PATH,chrome = DRIVER_PATH,screenshot = SCREENSHOTS_PATH,
                  excel = EXCEL_PATH):
         self.config = YamlReader(config).data
+        # print(self.config)
         self.elements = YamlReader(element).data
         self.case_data = YamlReader(case_data).data
         self.interface_data = YamlReader(interface_data).data
@@ -67,8 +68,9 @@ def get_excel(self,file_name):
 
 if __name__ == '__main__':
     c = Config()
-    print(c.get("ptahUrl").get('URL'))
-    print(c.get_ele('URL').get('url'))
-    print(c.exe_data())
+    # print(c.get("brwserType"))
+    # print(c.get_ele('URL').get('url'))
+    # print(c.exe_data())
     # print(c.screen_shot_path())
-    print(c.get_excel("user"))
+    # print(c.get_excel("user"))
+    # print(c.driver_ptah())

test/case/Autolt/test1.jpg

@@ -82,10 +82,6 @@ def data(self):
 
 
 if __name__ == '__main__':
-    y = 'config.yml'
+    y = 'browser.yaml'
     reader = YamlReader(y)
     print(reader.data)
-
-    # e = 'E:/Test_framework/data/baidu.xlsx'
-    # reader = ExcelReader(e, title_line=True)
-    # print(reader.data)