update README.md

hongbinbao · Jun 27, 2014 · 5ef1581 · 5ef1581
1 parent f0d20d3
commit 5ef1581
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-noserunner 0.0.2
+noserunner 1.0
 ==========
 
 runner based on python nose testing framework
@@ -17,11 +17,11 @@ runner based on python nose testing framework
 	python runtests.py [-h|--help]
 	                   [--cycle CYCLE]
 	                   [--duration DURATION_TIME]
-                       [--timeout TIMEOUT_VALUE_SECONDS]
+                           [--timeout TIMEOUT_VALUE_SECONDS]
 	                   [--plan-file PLAN_FILE]
 	                   [--livereport]
-	                   [--livereport-config LIVE_REPORT_CONFIG]
-	                   [--device-config DEVICE_CONFIG]
+	                   [--server-config SERVER_CONFIG]
+	                   [--client-config CLIENT_CONFIG]
 	                   [--verbosity VERBOSITY]
 	                   [,[argv]]
 
@@ -43,11 +43,11 @@ runner based on python nose testing framework
                               
 	    --livereport          Enable the live report server feature. Default is disable
 	    
-        --livereport-config   Specify the path of the lieve report server configuration file
-                              If not provide this option. The "livereport.config" file in current directory will be used as default
+        --server-config       Specify the path of the lieve report server configuration file
+                              If not provide this option. The "server.config" file in current directory will be used as default
                               
-        --device-config       Specify the path of device configuration file
-                              If not provide this option. The "device.config" file in current directory will be used as default
+        --client-config       Specify the path of device configuration file
+                              If not provide this option. The "client.config" file in current directory will be used as default
                               
 	    --verbosity           Default is 2. set the level(1~5) of verbosity to get the help string of every test and the result
 	    
@@ -70,7 +70,7 @@ runner based on python nose testing framework
         $ python runtests.py --cycle 10 --livereport
         
         specify the config file location of the live report server and device: 
-        $ python runtests.py --plan-file plan --cycle 10 --device-config device.config --livereport-config livereport.config --livereport
+        $ python runtests.py --plan-file plan --cycle 10 --client-config device.config --server-config livereport.config --livereport
         
 ### TestCaseContext instance provided by nose plugin
 
@@ -106,7 +106,7 @@ runner based on python nose testing framework
         python makeconfig.py --help
         
     e.g:
-        python makeconfig.py -s serial_number -f device.config
+        python makeconfig.py -s serial_number -f server.config
 
 ### Demo
 
@@ -128,9 +128,19 @@ runner based on python nose testing framework
     │       ├── __init__.py 
     │       ├── browser.py                              #test case for browser
     │       ├── phone.py                                #test case for phone
-    └── server.config                                   #config file (server, account, device...)
-    └── device.config                                   #device config file (serial number, product name, revision number...)
+    └── server.config                                   #server config file (server, account, device...)
+    └── client.config                                   #device config file (serial number, product name, revision number...)
     ├── plan                                            #test case plan file
+    ├── buildtest                                       #unit test package
+    │   ├── planloader_test.py
+    │   ├── reporter_test.py
+    │   ├── resource
+    │   │   ├── device.config
+    │   │   ├── livereport.config
+    │   │   ├── plan
+    │   │   └── repeatplan
+    │   └── ut.py
+
 
 ### unit test
     $ cd noserunner

diff --git a/client.config b/client.config
@@ -0,0 +1,6 @@
+[device]
+product = 11111my_product_name
+revision = 201403131408
+deviceid = 0123456789ABCDEF
+screen_width = 800
+screen_height = 1024
diff --git a/server.config b/server.config
@@ -0,0 +1,14 @@
+[updateserver]
+url = domain/api
+[server]
+auth =  http://192.168.5.79:8080/smartapi/accountbasic
+session_create =  http://192.168.5.79:8080/smartapi/group/2/session/%s
+session_update = http://192.168.5.79:8080/smartapi/group/2/session/%s
+case_update = http://192.168.5.79:8080/smartapi/session/%s/case
+file_upload = http://192.168.5.79:8080/smartapi/session/%s/case/%s/file
+[account]
+username = test
+password = 123456
+
+
+