Merge branch 'master' into 'autotest_ly'

# Conflicts:
#   test/data/zentao/processor.php

test/data/action.yaml

@@ -65,7 +65,7 @@ fields:
     format: ""
   - field: extra
     note: "附加参数"
-    range: 1{4},11,1{22},33,1{22},101,1{22},131,1{22},161,1{3}
+    range: 1{4},11,1{3}, 2 ,1{18},33,1{22},101,1{22},131,1{22},161,1{3}
     prefix: ""
     postfix: ""
     loop: 0

test/data/zentao/config.php

@@ -49,6 +49,7 @@ $builder->product             = array('rows' => 100, 'extends' => array('product
 $builder->productalone        = array('rows' => 20, 'extends' => array('product','productalone'));
 $builder->productline         = array('rows' => 20,  'extends' => array('module', 'productline'));
 $builder->productplan         = array('rows' => 70, 'extends' => array('productplan'));
+$builder->productsonplan      = array('rows' => 10, 'extends' => array('productplan', 'productsonplan'));
 $builder->branch              = array('rows' => 240, 'extends' => array('branch'));
 $builder->projectproduct      = array('rows' => 200, 'extends' => array('projectproduct'));
 $builder->projectproductalone = array('rows' => 28, 'extends' => array('projectproduct','projectproductalone'));

test/data/zentao/processor.php

@@ -51,6 +51,8 @@ class Processor
         $this->initBug();
         $this->initTest();
         $this->initTodo();
+        $this->initSonPlan();
+        $this->initBassicSql();
 
         $this->dao->commit();
     }
@@ -444,4 +446,15 @@ class Processor
         $this->dao->query("update zt_kanbancolumn set `parent` = '-1' where id = 206");
         $this->dao->query("update zt_kanbancolumn set `parent` = '206' where id in ('207','208')");
     }
+
+    /**
+     * Init son plan
+     *
+     * @access public
+     * @return void
+     */
+    public function initSonPlan()
+    {
+        $this->dao->query("update zt_productplan set `parent` = '-1' where id < 10 and id > 0");
+    }
 }