From: Lucas Meneghel Rodrigues <[email protected]>
diff --git a/client/tests/kvm_runtest_2/kvm_install.py
b/client/tests/kvm_runtest_2/kvm_install.py
index 551b71f..a1c3d8e 100755
--- a/client/tests/kvm_runtest_2/kvm_install.py
+++ b/client/tests/kvm_runtest_2/kvm_install.py
@@ -1,15 +1,7 @@
-import time
-import os
-import sys
-import urllib
-import re
-import signal
+import time, os, sys, urllib, re, signal, logging
from datetime import *
-
from autotest_lib.client.bin import utils, test
from autotest_lib.client.common_lib import error
-
-import logging
import kvm_utils
@@ -273,8 +265,7 @@ def __install_kvm(test, srcdir):
run("make -C extboot", "make extboot", 60)
cp1 = "cp -f bios/BIOS-bochs-latest qemu/pc-bios/bios.bin"
cp2 = "cp -f vgabios/VGABIOS-lgpl-latest.bin qemu/pc-bios/vgabios.bin"
- cp3 = "cp -f vgabios/VGABIOS-lgpl-latest.cirrus.bin qemu/pc-bios/"
- "vgabios-cirrus.bin"
+ cp3 = "cp -f vgabios/VGABIOS-lgpl-latest.cirrus.bin
qemu/pc-bios/vgabios-cirrus.bin"
cp4 = "cp -f extboot/extboot.bin qemu/pc-bios/extboot.bin"
cmd = "&& ".join([cp1, cp2, cp3, cp4])
run(cmd, "copy bios binaries", 30)
diff --git a/client/tests/kvm_runtest_2/kvm_utils.py
b/client/tests/kvm_runtest_2/kvm_utils.py
index feb4af1..1f2f790 100644
--- a/client/tests/kvm_runtest_2/kvm_utils.py
+++ b/client/tests/kvm_runtest_2/kvm_utils.py
@@ -1,25 +1,5 @@
-#!/usr/bin/python
-
-<<<<<<< HEAD:client/tests/kvm_runtest_2/kvm_utils.py
-import md5
-import thread
-import subprocess
-import time
-import string
-import random
-import socket
-import os
-import signal
-import pty
-import select
-import re
-
-import kvm_log
-=======
import md5, thread, subprocess, time, string, random, socket, os, signal, pty
import select, re, logging
->>>>>>> d701d9e... Fixing a kvm_log import lying around, imported logging on
kvm_utils.:client/tests/kvm_runtest_2/kvm_utils.py
-
# Functions for working with dicts obtained from the test config file
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
