{"repo": "ceph/teuthology", "pull_number": 355, "instance_id": "ceph__teuthology-355", "issue_numbers": "", "base_commit": "8aa6bf0ca856a93ef6fad096473ef766d07c221a", "patch": "diff --git a/scripts/results.py b/scripts/results.py\n--- a/scripts/results.py\n+++ b/scripts/results.py\n@@ -1,40 +1,22 @@\n-import argparse\n+\"\"\"\n+usage: teuthology-results [-h] [-v] [--dry-run] [--email EMAIL] [--timeout TIMEOUT] --archive-dir DIR --name NAME\n \n+Email teuthology suite results\n+\n+optional arguments:\n+  -h, --help         show this help message and exit\n+  -v, --verbose      be more verbose\n+  --dry-run          Instead of sending the email, just print it\n+  --email EMAIL      address to email test failures to\n+  --timeout TIMEOUT  how many seconds to wait for all tests to finish (default\n+                     no wait)\n+  --archive-dir DIR  path under which results for the suite are stored\n+  --name NAME        name of the suite\n+\"\"\"\n+import docopt\n import teuthology.results\n \n \n def main():\n-    teuthology.results.main(parse_args())\n-\n-\n-def parse_args():\n-    parser = argparse.ArgumentParser(\n-        description='Email teuthology suite results')\n-    parser.add_argument(\n-        '--email',\n-        help='address to email test failures to',\n-    )\n-    parser.add_argument(\n-        '--timeout',\n-        help='how many seconds to wait for all tests to finish (default no ' +\n-        'wait)',\n-        type=int,\n-        default=0,\n-    )\n-    parser.add_argument(\n-        '--archive-dir',\n-        metavar='DIR',\n-        help='path under which results for the suite are stored',\n-        required=True,\n-    )\n-    parser.add_argument(\n-        '--name',\n-        help='name of the suite',\n-        required=True,\n-    )\n-    parser.add_argument(\n-        '-v', '--verbose',\n-        action='store_true', default=False,\n-        help='be more verbose',\n-    )\n-    return parser.parse_args()\n+    args = docopt.docopt(__doc__)\n+    teuthology.results.main(args)\ndiff --git a/teuthology/results.py b/teuthology/results.py\n--- a/teuthology/results.py\n+++ b/teuthology/results.py\n@@ -8,6 +8,7 @@\n from textwrap import fill\n \n import teuthology\n+from teuthology.config import config\n from teuthology import misc\n from teuthology import ls\n from .job_status import get_status\n@@ -19,56 +20,60 @@\n def main(args):\n \n     log = logging.getLogger(__name__)\n-    if args.verbose:\n+    if args['--verbose']:\n         teuthology.log.setLevel(logging.DEBUG)\n \n-    misc.read_config(args)\n-\n-    log_path = os.path.join(args.archive_dir, 'results.log')\n-    teuthology.setup_log_file(log_path)\n+    if not args['--dry-run']:\n+        log_path = os.path.join(args['--archive-dir'], 'results.log')\n+        teuthology.setup_log_file(log_path)\n \n     try:\n-        results(args)\n+        results(args['--archive-dir'], args['--name'], args['--email'],\n+                args['--timeout'], args['--dry-run'])\n     except Exception:\n         log.exception('error generating results')\n         raise\n \n \n-def results(args):\n-    archive_base = os.path.split(args.archive_dir)[0]\n+def results(archive_dir, name, email, timeout, dry_run):\n+    archive_base = os.path.split(archive_dir)[0]\n     serializer = ResultsSerializer(archive_base)\n     starttime = time.time()\n \n-    log.info('Waiting up to %d seconds for tests to finish...', args.timeout)\n-    while serializer.running_jobs_for_run(args.name) and args.timeout > 0:\n-        if time.time() - starttime > args.timeout:\n+    if timeout:\n+        log.info('Waiting up to %d seconds for tests to finish...', timeout)\n+    while serializer.running_jobs_for_run(name) and timeout > 0:\n+        if time.time() - starttime > timeout:\n             log.warn('test(s) did not finish before timeout of %d seconds',\n-                     args.timeout)\n+                     timeout)\n             break\n         time.sleep(10)\n     log.info('Tests finished! gathering results...')\n \n-    (subject, body) = build_email_body(args.name, args.archive_dir,\n-                                       args.timeout)\n+    (subject, body) = build_email_body(name, archive_dir)\n \n     try:\n-        if args.email:\n+        if email and dry_run:\n+            print \"From: %s\" % (config.results_sending_email or 'teuthology')\n+            print \"To: %s\" % email\n+            print \"Subject: %s\" % subject\n+            print body\n+        elif email:\n             email_results(\n                 subject=subject,\n-                from_=args.teuthology_config.get('results_sending_email',\n-                                                 'teuthology'),\n-                to=args.email,\n+                from_=(config.results_sending_email or 'teuthology'),\n+                to=email,\n                 body=body,\n             )\n     finally:\n-        generate_coverage(args)\n+        generate_coverage(archive_dir, name)\n \n \n-def generate_coverage(args):\n+def generate_coverage(archive_dir, name):\n     coverage_config_keys = ('coverage_output_dir', 'coverage_html_dir',\n                             'coverage_tools_dir')\n     for key in coverage_config_keys:\n-        if key not in args.teuthology_config:\n+        if key not in config.to_dict():\n             log.warn(\n                 \"'%s' not in teuthology config; skipping coverage report\",\n                 key)\n@@ -79,14 +84,12 @@ def generate_coverage(args):\n             os.path.join(os.path.dirname(sys.argv[0]), 'teuthology-coverage'),\n             '-v',\n             '-o',\n-            os.path.join(args.teuthology_config[\n-                         'coverage_output_dir'], args.name),\n+            os.path.join(config.coverage_output_dir, name),\n             '--html-output',\n-            os.path.join(args.teuthology_config[\n-                         'coverage_html_dir'], args.name),\n+            os.path.join(config.coverage_html_dir, name),\n             '--cov-tools-dir',\n-            args.teuthology_config['coverage_tools_dir'],\n-            args.archive_dir,\n+            config.coverage_tools_dir,\n+            archive_dir,\n         ],\n     )\n \n@@ -105,7 +108,7 @@ def email_results(subject, from_, to, body):\n     smtp.quit()\n \n \n-def build_email_body(name, archive_dir, timeout):\n+def build_email_body(name, archive_dir):\n     failed = {}\n     hung = {}\n     passed = {}\n", "test_patch": "diff --git a/teuthology/test/test_results.py b/teuthology/test/test_results.py\n--- a/teuthology/test/test_results.py\n+++ b/teuthology/test/test_results.py\n@@ -86,8 +86,6 @@ def test_build_email_body(self):\n         self.archive.populate_archive(run_name, self.reference['jobs'])\n         (subject, body) = results.build_email_body(\n             run_name,\n-            run_dir,\n-            36000)\n+            run_dir)\n         assert subject == self.reference['subject']\n-        print body\n         assert body == self.reference['body']\n", "problem_statement": "", "hints_text": "", "created_at": "2014-11-11T23:48:49Z"}