@ -899,8 +899,8 @@ def process_logs(queue, indicatorsfmt, argv, log_dir, runtime_file, csv_file, xm
pname , action , args = queue . get ( )
pname , action , args = queue . get ( )
if action == ' quit ' :
if action == ' quit ' :
if log_dir:
if xml_file or log_dir:
with open ( os. path . join ( log_dir , ' RESULTS.xml ' ) , ' a ' ) as f :
with open ( results_xml , ' a ' ) as f :
f . write ( ' </results> \n <stop utc= %s local= %s /> \n </root> \n ' % ( xmlquoteattr ( strfutctime ( ) ) , xmlquoteattr ( strflocaltime ( ) ) ) )
f . write ( ' </results> \n <stop utc= %s local= %s /> \n </root> \n ' % ( xmlquoteattr ( strfutctime ( ) ) , xmlquoteattr ( strflocaltime ( ) ) ) )
break
break
@ -2571,7 +2571,7 @@ except ImportError:
notfound . append ( ' paramiko ' )
notfound . append ( ' paramiko ' )
def load_keyfile ( keyfile ) :
def load_keyfile ( keyfile ) :
for cls in ( paramiko . RSAKey , paramiko . DSSKey , paramiko . ECDSAKey ):
for cls in ( paramiko . RSAKey , paramiko . DSSKey , paramiko . ECDSAKey , paramiko . Ed25519Key ):
try :
try :
return cls . from_private_key_file ( keyfile )
return cls . from_private_key_file ( keyfile )
except paramiko . SSHException :
except paramiko . SSHException :
@ -2592,7 +2592,7 @@ class SSH_login(TCP_Cache):
( ' user ' , ' usernames to test ' ) ,
( ' user ' , ' usernames to test ' ) ,
( ' password ' , ' passwords to test ' ) ,
( ' password ' , ' passwords to test ' ) ,
( ' auth_type ' , ' type of password authentication to use [password|keyboard-interactive|auto] ' ) ,
( ' auth_type ' , ' type of password authentication to use [password|keyboard-interactive|auto] ' ) ,
( ' keyfile ' , ' file with RSA, DSA or ECDSA private key to test' ) ,
( ' keyfile ' , ' file with RSA, DSA , ECDSA or ED25519 private key to test' ) ,
)
)
available_options + = TCP_Cache . available_options
available_options + = TCP_Cache . available_options