[Libvirt-cim] [PATCH] Fix key generation
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1237399611 25200
# Node ID 5f95e05cced6279241c9200333bc4d41f83c83d8
# Parent daccd46e12ccf2afce3295a41510d7e94ff48d7b
Fix key generation
Instead of setting up the ssh keys prior to each test run, the keys need to be
setup before main.py is called. This fixes the issue where cimtest would
complain if an id_rsa key wasn't already available.
Now, if the key isn't available, it generates one. Otherwise, it uses the
available key.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r daccd46e12cc -r 5f95e05cced6 runtests
--- a/runtests Fri Mar 13 10:31:02 2009 -0700
+++ b/runtests Wed Mar 18 11:06:51 2009 -0700
@@ -22,6 +22,8 @@
import sys
import os
+sys.path.append('./lib')
+from VirtLib.utils import setup_ssh_key
SUITES_DIR = 'suites'
MAIN_FILE = 'main.py'
@@ -53,6 +55,8 @@
print "\t%s" % ", ".join(available_suites())
return 1
+ setup_ssh_key()
+
suite = sys.argv[1]
print "Starting test suite: %s" % suite
diff -r daccd46e12cc -r 5f95e05cced6 suites/libvirt-cim/lib/XenKvmLib/const.py
--- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri Mar 13 10:31:02 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Mar 18 11:06:51 2009 -0700
@@ -134,9 +134,9 @@
try:
from CimTest.Globals import logger, log_param
log_param()
- from VirtLib.utils import setup_ssh_key
+ #from VirtLib.utils import setup_ssh_key
from XenKvmLib.test_doms import destroy_and_undefine_all
- setup_ssh_key()
+ #setup_ssh_key()
destroy_and_undefine_all(options.ip, options.virt)
rc = f()
except Exception, e: