[rhmessaging-commits] rhmessaging commits: r4221 - in mgmt/newdata/cumin: python/cumin and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2010-08-24 16:26:12 -0400 (Tue, 24 Aug 2010)
New Revision: 4221

Modified:
   mgmt/newdata/cumin/bin/cumin-smoke-test
   mgmt/newdata/cumin/python/cumin/model.py
Log:
For bz 626999, scope job summaries by the right id; repair cumin-smoke-test

Modified: mgmt/newdata/cumin/bin/cumin-smoke-test
===================================================================
--- mgmt/newdata/cumin/bin/cumin-smoke-test	2010-08-24 20:18:14 UTC (rev 4220)
+++ mgmt/newdata/cumin/bin/cumin-smoke-test	2010-08-24 20:26:12 UTC (rev 4221)
@@ -25,7 +25,7 @@
 
     setup_logging(opts)
 
-    cumin = Cumin(config.home, opts.broker, opts.database,
+    cumin = Cumin(config.home, opts.brokers, opts.database,
                   opts.host, opts.port)
 
     cumin.user = values.web.user
@@ -106,8 +106,12 @@
 
     print "Getting job summaries for", obj,
 
+    assert obj
+
     summs = cumin.model.get_submission_job_summaries(obj)
 
+    assert summs is not None
+
     print "-> [%i job summaries]" % len(summs)
 
     #pprint(summs)

Modified: mgmt/newdata/cumin/python/cumin/model.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/model.py	2010-08-24 20:18:14 UTC (rev 4220)
+++ mgmt/newdata/cumin/python/cumin/model.py	2010-08-24 20:26:12 UTC (rev 4221)
@@ -96,12 +96,12 @@
 
         try:
             try:
-                store = self.job_summaries_by_submission[submission._qmf_agent_id]
+                store = self.job_summaries_by_submission[submission._id]
             except KeyError:
                 store = SubmissionJobSummaryStore(self, submission)
                 store.start_updates()
 
-                self.job_summaries_by_submission[submission._qmf_agent_id] = store
+                self.job_summaries_by_submission[submission._id] = store
 
                 for i in range(5):
                     if store.data:
@@ -1974,6 +1974,6 @@
             (completion, self.submission, "GetJobSummaries", ())
 
     def delete(self):
-        del self.model.job_summaries_by_submission[self.submission._qmf_agent_id]
+        del self.model.job_summaries_by_submission[self.submission._id]
 
         super(SubmissionJobSummaryStore, self).delete()