修改文件上传：支持多种浏览器上传

修改日志类：修改无法根据config中级别输出日志
修改发送邮件：支持多个附件

Author: huilansame

config/config.ini

@@ -3,30 +3,30 @@
 ;     Database configuration.
 ;     Path of all layers.
 ;     Email configuration.
-;     Encrypt configuration.
+;     Logging configuration.
 ;
 
 
 [db]
-; Required if you want to connect to database.
-;  -args:
+; Required.AutoTestFramework Database.
+;  -options:
 ;     driver  : Database type.For now, support mysql and oracle.
 ;     host    : Database IP.
 ;     port    : Database port.
 ;     user    : Connect user.
 ;     pwd     : Password.
 ;     db_name : Database name.
-driver = oracle
-host = 192.168.7.226
-port = 1521
-user = zhigouceshi
-pwd = zhigouceshi
-db_name = ZHIGOU
+driver = mysql
+host = localhost
+port = 3306
+user = root
+pwd = 123456
+db_name = autotest
 
 
 [path]
 ; Required.
-;  -args:
+;  -options:
 ;     base    : Absolute path of the project. Required.
 ;     log     : Path of logfiles. Not required. Default: %(base)s\log\.
 ;     report  : Path of reports. Not required. Default: %(base)s\report\.
@@ -42,29 +42,28 @@ url_xml = %(data)s\zhigou.xml
 
 [email]
 ; Not required.If you want to send report email to somebody, you'll need to configure this.
-;  -args:
+;  -options:
 ;     server  : Email server,for example: smtp.126.com.
 ;     from    : Eamil which uses to send reports.
 ;     pass    : Password of the from email.
 ;     to      : Who will receive the reports.Use ';' to seperate a list of receivers.
-server = smtp.126.com
-from = womende218@126.com
-pass = kaixinzhima123?
+server = smtp.boce.cn
+from = zhangxin@boce.cn
+pass = ????
 to = 396214358@qq.com
 
 
-[encrypt]
-; Not required.If your project interface need to encrypt, then you need to give the private key and the salt.
-;  -args:
-;     priv_key: Private key of the interface.
-;     pwd_key : Salt which encrypt all passwords of interface.
-priv_key = 84b0d211449da13fc9db1c1555e3ef00
-pwd_key = 5gN^zqGb#Szht&NYwv^p7b*Qq3Y$YF!3
-
-
 [logging]
+; Required.
+;  -options:
+;     backup_count : log files count to keep.
+;     console_output_level
+;     file_output_level
+;     log_file_name
+;     console_output : output log if set 1, else not.
+;     file_output : output log if set 1, else not.
 backup_count = 10
-console_output_level = ERROR
+console_output_level = WARNING
 file_output_level = DEBUG
 log_file_name = test.log
 console_output = 1

config/config_zhigou.ini

@@ -0,0 +1,26 @@
+; Project configuration.
+
+[db]
+; Required if you want to connect to database.
+;  -args:
+;     driver  : Database type.For now, support mysql and oracle.
+;     host    : Database IP.
+;     port    : Database port.
+;     user    : Connect user.
+;     pwd     : Password.
+;     db_name : Database name.
+driver = oracle
+host = 192.168.7.226
+port = 1521
+user = zhigouceshi
+pwd = zhigouceshi
+db_name = ZHIGOU
+
+
+[encrypt]
+; Not required.If your project interface need to encrypt, then you need to give private key and salt.
+;  -args:
+;     priv_key: Private key of the interface.
+;     pwd_key : Salt which encrypt all passwords of interface.
+private_key = 84b0d211449da13fc9db1c1555e3ef00
+salt = 5gN^zqGb#Szht&NYwv^p7b*Qq3Y$YF!3

config/log.conf

@@ -1,5 +1,3 @@
-# Configuration for log output
-
 [loggers]
 keys = root
 
@@ -11,15 +9,24 @@ keys = simpleFmt
 
 [logger_root]
 level = DEBUG
-handlers = consoleHandler
-# handlers = fileHandler
+handlers = consoleHandler,fileHandler
 
 [handler_consoleHandler]
 class = StreamHandler
 level = DEBUG
 formatter = simpleFmt
 args = (sys.stdout,)
 
+[handler_fileHandler]
+class = handlers.TimedRotatingFileHandler
+level = ERROR
+formatter = simpleFmt
+args = ('test.log', 'D', 1, 10)
+
 [formatter_simpleFmt]
-format = %(asctime)s - %(name)s - %(levelname)s - %(message)s - [%(filename)s:%(lineno)s]
-datefmt = %Y-%m-%d %H:%M:%S
+format = %(asctime)s - %(name)s - %(levelname)s - %(message)s
+datefmt = %Y-%m-%d %H:%M:%S
+
+
+
+

src/others/filesupload.py

@@ -14,7 +14,7 @@
 time.sleep(1)
 
 # win32gui
-dialog = win32gui.FindWindow('#32770', None)
+dialog = win32gui.FindWindow('#32770', u'文件上传')
 ComboBoxEx32 = win32gui.FindWindowEx(dialog, 0, 'ComboBoxEx32', None)
 ComboBox = win32gui.FindWindowEx(ComboBoxEx32, 0, 'ComboBox', None)
 Edit = win32gui.FindWindowEx(ComboBox, 0, 'Edit', None)
@@ -23,6 +23,9 @@
 win32gui.SendMessage(Edit, win32con.WM_SETTEXT, 0, '"d:\\baidu.py" "d:\\upload.py" "d:\\1.html"')
 win32gui.SendMessage(dialog, win32con.WM_COMMAND, 1, button)
 
+print dialog
+print Edit
+print button
 
 print dr.find_element_by_id('status_info').text
 dr.quit()

src/others/trylogging.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+import logging
+import logging.config
+from src.utils.config import DefaultConfig
+
+# log_path = DefaultConfig().base_path + '\config\log.conf'
+# print log_path
+# logging.config.fileConfig(log_path)
+
+# logging.basicConfig(level=logging.NOTSET)
+log = logging.getLogger('s')
+logging.root.setLevel(logging.NOTSET)
+
+console = logging.StreamHandler()
+console.setLevel(logging.INFO)
+console.setFormatter(logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
+
+log.addHandler(console)
+print log.getEffectiveLevel()
+
+# log.debug('debug message')
+log.info('info message')
+# log.error('error message')
+# log.critical('critical message')
+
+print log.handlers
+print logging.root.handlers

src/resource/__init__.py

@@ -24,9 +24,6 @@
 from src.utils.utils_exception import ConfigFileException, ConfigError
 
 
-# todo(396214358@qq.com): log when log module finished.
-
-
 # 获取当前文件绝对路径，从而获得config层路径
 UTILS_PATH = os.path.split(os.path.realpath(__file__))[0]
 CONFIG_PATH = UTILS_PATH + '\\..\\..\\config\\'  # config层
@@ -41,20 +38,6 @@ def __init__(self, filename='config.ini'):
         else:
             raise ConfigFileException('Config file not exists or not available.Please check {}.'.format(self.path))
 
-
-class DefaultConfig(Config):
-    """
-        -properties:
-            db_connect  : Return database string which can use to connect to database.
-            base_path   : Return [path].base value.
-            log_path    : Return [path].log value or default log path.
-            report_path : Return [path].report value or default report path.
-            data_path   : Return [path].data value or default data path.
-            driver_path : Return default driver path.
-    """
-    def __init__(self):
-        Config.__init__(self)
-
     def _mysql_connect(self):
         """Get sqlalchemy database connection string."""
         return 'mysql+{0}://{1}:{2}@{3}:{4}/{5}?charset=utf8'.format(
@@ -88,6 +71,20 @@ def db_connect(self):
             raise ConfigError('[db] section is required. And [db] section must have these options:'
                               '"driver", "user", "pwd", "host", "port", "db_name"')
 
+
+class DefaultConfig(Config):
+    """
+        -properties:
+            db_connect  : Return database string which can use to connect to database.
+            base_path   : Return [path].base value.
+            log_path    : Return [path].log value or default log path.
+            report_path : Return [path].report value or default report path.
+            data_path   : Return [path].data value or default data path.
+            driver_path : Return default driver path.
+    """
+    def __init__(self):
+        Config.__init__(self)
+
     @property
     def base_path(self):
         try: