| Message ID | b67dad695ed0122715240faa50e9693d2d0eaab4.1243179847.git.mgoldish@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, 2009-05-24 at 18:46 +0300, Michael Goldish wrote: > Also, don't do it in kvm_preprocessing.py since it's now done in kvm_vm.py. Looks good to me! > Signed-off-by: Michael Goldish <mgoldish@redhat.com> > --- > client/tests/kvm_runtest_2/kvm_preprocessing.py | 1 - > client/tests/kvm_runtest_2/kvm_vm.py | 2 ++ > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/client/tests/kvm_runtest_2/kvm_preprocessing.py b/client/tests/kvm_runtest_2/kvm_preprocessing.py > index bcabf5a..9ccaf78 100644 > --- a/client/tests/kvm_runtest_2/kvm_preprocessing.py > +++ b/client/tests/kvm_runtest_2/kvm_preprocessing.py > @@ -84,7 +84,6 @@ def preprocess_vm(test, params, env, name): > start_vm = True > > if start_vm: > - vm.destroy() > if not vm.create(name, params, qemu_path, image_dir, iso_dir, for_migration): > message = "Could not start VM" > kvm_log.error(message) > diff --git a/client/tests/kvm_runtest_2/kvm_vm.py b/client/tests/kvm_runtest_2/kvm_vm.py > index df99859..a1462c6 100644 > --- a/client/tests/kvm_runtest_2/kvm_vm.py > +++ b/client/tests/kvm_runtest_2/kvm_vm.py > @@ -238,6 +238,8 @@ class VM: > stored in the class attributes is used, and if it is supplied, it is stored > for later use. > """ > + self.destroy() > + > if name != None: > self.name = name > if params != None:
diff --git a/client/tests/kvm_runtest_2/kvm_preprocessing.py b/client/tests/kvm_runtest_2/kvm_preprocessing.py index bcabf5a..9ccaf78 100644 --- a/client/tests/kvm_runtest_2/kvm_preprocessing.py +++ b/client/tests/kvm_runtest_2/kvm_preprocessing.py @@ -84,7 +84,6 @@ def preprocess_vm(test, params, env, name): start_vm = True if start_vm: - vm.destroy() if not vm.create(name, params, qemu_path, image_dir, iso_dir, for_migration): message = "Could not start VM" kvm_log.error(message) diff --git a/client/tests/kvm_runtest_2/kvm_vm.py b/client/tests/kvm_runtest_2/kvm_vm.py index df99859..a1462c6 100644 --- a/client/tests/kvm_runtest_2/kvm_vm.py +++ b/client/tests/kvm_runtest_2/kvm_vm.py @@ -238,6 +238,8 @@ class VM: stored in the class attributes is used, and if it is supplied, it is stored for later use. """ + self.destroy() + if name != None: self.name = name if params != None:
Also, don't do it in kvm_preprocessing.py since it's now done in kvm_vm.py. Signed-off-by: Michael Goldish <mgoldish@redhat.com> --- client/tests/kvm_runtest_2/kvm_preprocessing.py | 1 - client/tests/kvm_runtest_2/kvm_vm.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-)