Debug travis

OCA · Mar 30, 2017 · 45d0019 · 45d0019
1 parent 8a291da
commit 45d0019
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/queue_job/job.py b/queue_job/job.py
@@ -208,9 +208,6 @@ def load(cls, env, job_uuid):
         if stored.eta:
             eta = dt_from_string(stored.eta)
 
-        if not stored.channel:
-            # travis debug
-            raise Exception('Channel not found')
         job_ = cls(method, args=args, kwargs=kwargs,
                    priority=stored.priority, eta=eta, job_uuid=stored.uuid,
                    description=stored.name, channel=stored.channel)

diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py
@@ -78,9 +78,8 @@ class QueueJob(models.Model):
                                       readonly=True,
                                       store=True)
 
-    channel = fields.Char( compute='_compute_job_function',
-                          # travis debug
-                          #inverse='_inverse_channel',
+    channel = fields.Char(compute='_compute_channel',
+                          inverse='_inverse_channel',
                           store=True,
                           index=True)
 
@@ -105,7 +104,6 @@ def _compute_job_function(self):
             function = func_model.search([('name', '=', channel_method_name)])
             record.channel_method_name = channel_method_name
             record.job_function_id = function
-            record.channel = record.job_function_id.channel
 
     @api.multi
     @api.depends('model_name', 'method_name', 'record_ids', 'args', 'kwargs')

diff --git a/test_queue_job/tests/test_job.py b/test_queue_job/tests/test_job.py
@@ -205,7 +205,6 @@ def test_read(self):
         self.assertEqual(test_job.result, job_read.result)
         self.assertEqual(test_job.user_id, job_read.user_id)
         self.assertEqual(test_job.company_id, job_read.company_id)
-        self.assertEqual('root', job_read.channel)
         delta = timedelta(seconds=1)  # DB does not keep milliseconds
         self.assertAlmostEqual(test_job.date_created, job_read.date_created,
                                delta=delta)

diff --git a/test_queue_job/tests/test_job_channels.py b/test_queue_job/tests/test_job_channels.py
@@ -68,6 +68,8 @@ def test_channel_on_job(self):
         test_job.store()
         stored = self.env['queue.job'].search([('uuid', '=', test_job.uuid)])
         self.assertEquals(stored.channel, 'root')
+        job_read = Job.load(self.env, test_job.uuid)
+        self.assertEquals(job_read.channel, 'root')
 
         channel = self.channel_model.create(
             {'name': 'sub', 'parent_id': self.root_channel.id}