Merge pull request #186 from gblomqvist/master

Write XML ending to correct file when using --xml
Merge pull request #199 from laxa/add_ed25519_support
1 changed files with 4 additions and 4 deletions
--- a/patator.py
+++ b/patator.py
@ -899,8 +899,8 @@ def process_logs(queue, indicatorsfmt, argv, log_dir, runtime_file, csv_file, xm
    pname, action, args = queue.get()

    if action == 'quit':
-      if log_dir:
-        with open(os.path.join(log_dir, 'RESULTS.xml'), 'a') as f:
+      if xml_file or log_dir:
+        with open(results_xml, 'a') as f:
          f.write('</results>\n<stop utc=%s local=%s/>\n</root>\n' % (xmlquoteattr(strfutctime()), xmlquoteattr(strflocaltime())))
      break

@ -2571,7 +2571,7 @@ except ImportError:
  notfound.append('paramiko')

 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:
      return cls.from_private_key_file(keyfile)
    except paramiko.SSHException:
@ -2592,7 +2592,7 @@ class SSH_login(TCP_Cache):
    ('user', 'usernames to test'),
    ('password', 'passwords to test'),
    ('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
Author	SHA1	Message	Date
lanjelot	97a694f17d	Merge pull request #186 from gblomqvist/master Write XML ending to correct file when using --xml	8 months ago
lanjelot	3190a428a0	Merge pull request #199 from laxa/add_ed25519_support Add ed25519 ssh support	8 months ago
laxa	c783c8b63f	Add ed25519 ssh support	8 months ago
Gustaf Blomqvist	5adfad0eb9	Write XML ending to correct file when using --xml Previously when using --xml=FILE the beginning of the XML file would be written to FILE, while its ending would either (1) not be written at all (no -l/-L option), or (2) be written to RESULTS.xml in the directory specified using -l/-L. This patch ensures that the ending of the XML file is always written to the correct file.	2 years ago