[dts] [next]virt: fix attribute and argument error

[dts] [next]virt: fix attribute and argument error

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 framework/virt_base.py | 7 ++++---
 framework/virt_dut.py  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/framework/virt_base.py b/framework/virt_base.py
index e6a6d08..78e3334 100644
--- a/framework/virt_base.py
+++ b/framework/virt_base.py
@@ -364,9 +364,10 @@ class VirtBase(object):
         skip_setup = self.host_dut.skip_setup
         base_dir = self.host_dut.base_dir
         vm_dut.set_speedup_options(read_cache, skip_setup)
-        func_only = self.host_dut.want_func_tests
-        perf_only = self.host_dut.want_perf_tests
-        vm_dut.set_test_types(func_tests=func_only, perf_tests=perf_only)
+
+        # package and patch should be set before prerequisites
+        vm_dut.set_package(self.host_dut.package, self.host_dut.patches)
+
         # base_dir should be set before prerequisites
         vm_dut.set_directory(base_dir)
 
diff --git a/framework/virt_dut.py b/framework/virt_dut.py
index e13c48c..348279d 100644
--- a/framework/virt_dut.py
+++ b/framework/virt_dut.py
@@ -150,7 +150,7 @@ class VirtDut(DPDKdut):
         At last setup DUT' environment for validation.
         """
         if not self.skip_setup:
-            self.prepare_package(pkgName, patch)
+            self.prepare_package()
 
         self.send_expect("cd %s" % self.base_dir, "# ")
         self.send_expect("alias ls='ls --color=none'", "#")
-- 
1.9.3

Re: [dts] [next]virt: fix attribute and argument error

[Liu, Yong]

Thanks, applied into next branch.

On 08/09/2016 03:43 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
> ---
>   framework/virt_base.py | 7 ++++---
>   framework/virt_dut.py  | 2 +-
>   2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/framework/virt_base.py b/framework/virt_base.py
> index e6a6d08..78e3334 100644
> --- a/framework/virt_base.py
> +++ b/framework/virt_base.py
> @@ -364,9 +364,10 @@ class VirtBase(object):
>           skip_setup = self.host_dut.skip_setup
>           base_dir = self.host_dut.base_dir
>           vm_dut.set_speedup_options(read_cache, skip_setup)
> -        func_only = self.host_dut.want_func_tests
> -        perf_only = self.host_dut.want_perf_tests
> -        vm_dut.set_test_types(func_tests=func_only, perf_tests=perf_only)
> +
> +        # package and patch should be set before prerequisites
> +        vm_dut.set_package(self.host_dut.package, self.host_dut.patches)
> +
>           # base_dir should be set before prerequisites
>           vm_dut.set_directory(base_dir)
>   
> diff --git a/framework/virt_dut.py b/framework/virt_dut.py
> index e13c48c..348279d 100644
> --- a/framework/virt_dut.py
> +++ b/framework/virt_dut.py
> @@ -150,7 +150,7 @@ class VirtDut(DPDKdut):
>           At last setup DUT' environment for validation.
>           """
>           if not self.skip_setup:
> -            self.prepare_package(pkgName, patch)
> +            self.prepare_package()
>   
>           self.send_expect("cd %s" % self.base_dir, "# ")
>           self.send_expect("alias ls='ls --color=none'", "#")