Clarify job vs. run

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/test/fake_archive.py b/teuthology/test/fake_archive.py
index 6e7afe85017b5ad99c6da8c5e161f94a51e9c8fb..b27a1a7877011527f0b58093c3673ea72df3e621 100644 (file)
--- a/teuthology/test/fake_archive.py
+++ b/teuthology/test/fake_archive.py
@@ -8,19 +8,20 @@ class FakeArchive(object):
     def __init__(self, archive_base="./test_archive"):
         self.archive_base = archive_base
 
-    def get_random_metadata(self, name, hung=False):
+    def get_random_metadata(self, run_name, job_id=None, hung=False):
         """
         Generate a random info dict for a fake job. If 'hung' is not True, also
         generate a summary dict.
 
-        :param name: test name e.g. 'test_foo'
-        :param hung: simulate a hung job e.g. don't return a summary.yaml
-        :return: a dict with keys 'job_id', 'info' and possibly 'summary', with
-                corresponding values
+        :param run_name:   Run name e.g. 'test_foo'
+        :param job_id: Job ID e.g. '12345'
+        :param hung:   Simulate a hung job e.g. don't return a summary.yaml
+        :return:       A dict with keys 'job_id', 'info' and possibly
+                       'summary', with corresponding values
         """
         rand = random.Random()
 
-        description = 'description for job with name %s' % name
+        description = 'description for job with id %s' % job_id
         owner = 'job@owner'
         duration = rand.randint(1, 36000)
         pid = rand.randint(1000, 99999)
@@ -29,7 +30,7 @@ class FakeArchive(object):
         info = {
             'description': description,
             'job_id': job_id,
-            'name': name,
+            'run_name': run_name,
             'owner': owner,
             'pid': pid,
         }
@@ -60,9 +61,14 @@ class FakeArchive(object):
             shutil.rmtree(self.archive_base)
         os.mkdir(self.archive_base)
 
-    def populate_archive(self, jobs):
+    def teardown(self):
+        shutil.rmtree(self.archive_base)
+
+    def populate_archive(self, run_name, jobs):
+        run_archive_dir = os.path.join(self.archive_base, run_name)
+        os.mkdir(run_archive_dir)
         for job in jobs:
-            archive_dir = os.path.join(self.archive_base, str(job['job_id']))
+            archive_dir = os.path.join(run_archive_dir, str(job['job_id']))
             os.mkdir(archive_dir)
 
             with file(os.path.join(archive_dir, 'info.yaml'), 'w') as yfile:
@@ -73,6 +79,3 @@ class FakeArchive(object):
                 with file(summary_path, 'w') as yfile:
                     yaml.safe_dump(job['summary'], yfile)
 
-    def teardown(self):
-        shutil.rmtree(self.archive_base)
-

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index d64c510eef0097b04235805ba4a4cd23cc40e025..4ea59e2cbef8bd0a3bd96f91c1a256fd5c672e77 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -1,3 +1,4 @@
+import os
 import textwrap
 from .. import suite
 from .fake_archive import FakeArchive
@@ -5,7 +6,7 @@ from .fake_archive import FakeArchive
 
 class TestResultsEmail(object):
     reference = {
-        'name': 'test_name',
+        'run_name': 'test_name',
         'jobs': [
             {'info': {'description': 'description for job with name test_name',
                       'job_id': 30481,
@@ -39,7 +40,7 @@ class TestResultsEmail(object):
         'body': textwrap.dedent("""
     Test Run: test_name
     =================================================================
-    logs:   http://qa-proxy.ceph.com/teuthology/test_archive/
+    logs:   http://qa-proxy.ceph.com/teuthology/test_name/
     failed: 1
     hung:   1
     passed: 1
@@ -49,7 +50,7 @@ class TestResultsEmail(object):
     [88979]  description for job with name test_name
     -----------------------------------------------------------------
     time:   35190s
-    log:    http://qa-proxy.ceph.com/teuthology/test_archive/88979/
+    log:    http://qa-proxy.ceph.com/teuthology/test_name/88979/
 
         Failure reason!
 
@@ -68,14 +69,18 @@ class TestResultsEmail(object):
     def setup(self):
         self.archive = FakeArchive()
         self.archive.setup()
+        self.archive_base = self.archive.archive_base
 
     def teardown(self):
         self.archive.teardown()
 
     def test_build_email_body(self):
-        self.archive.populate_archive(self.reference['jobs'])
+        run_name = self.reference['run_name']
+        run_dir = os.path.join(self.archive_base, run_name)
+        self.archive.populate_archive(run_name, self.reference['jobs'])
         (subject, body) = suite.build_email_body(
-            self.reference['name'],
-            self.archive.archive_base, 36000)
+            run_name,
+            run_dir,
+            36000)
         assert subject == self.reference['subject']
         assert body == self.reference['body']