Merge lp:~zyga/checkbox/fix-1444242 into lp:checkbox

[Zygmunt Krynicki]

[Maciej Kisielewski (kissiel)]

+1, Thanks!

review: Approve

=== modified file 'plainbox/plainbox/impl/unit/job.py'
--- plainbox/plainbox/impl/unit/job.py	2015-04-08 11:13:36 +0000
+++ plainbox/plainbox/impl/unit/job.py	2015-04-15 16:41:22 +0000
@@ -523,7 +523,7 @@
             else:
                 implicit_namespace = None
             if self.imports is not None:
-                imports = self.get_imported_jobs()
+                imports = list(self.get_imported_jobs())
             else:
                 imports = None
             self._resource_program = ResourceProgram(

=== modified file 'plainbox/plainbox/impl/unit/test_job.py'
--- plainbox/plainbox/impl/unit/test_job.py	2015-04-08 11:13:36 +0000
+++ plainbox/plainbox/impl/unit/test_job.py	2015-04-15 16:41:22 +0000
@@ -27,10 +27,12 @@
 from unittest import TestCase
 import warnings
 
+from plainbox.impl.providers.v1 import Provider1
 from plainbox.impl.secure.origin import FileTextSource
 from plainbox.impl.secure.origin import Origin
 from plainbox.impl.secure.rfc822 import RFC822Record
 from plainbox.impl.unit.job import JobDefinition
+from plainbox.impl.unit.job import propertywithsymbols
 from plainbox.impl.unit.test_unit_with_id import UnitWithIdFieldValidationTests
 from plainbox.impl.unit.unit_with_id import UnitWithId
 from plainbox.impl.unit.validators import UnitValidationContext
@@ -39,7 +41,6 @@
 from plainbox.impl.validation import ValidationError
 from plainbox.testing_utils.testcases import TestCaseWithParameters
 from plainbox.vendor import mock
-from plainbox.impl.unit.job import propertywithsymbols
 
 
 class DecoratorTests(TestCase):
@@ -1338,3 +1339,23 @@
         expected = set({'foo', 'bar', 'froz'})
         observed = job.get_direct_dependencies()
         self.assertEqual(expected, observed)
+
+
+class RegressionTests(TestCase):
+
+    """ Regression tests. """
+
+    def test_1444242(self):
+        """ Regression test for http://pad.lv/1444242/. """
+        provider = mock.Mock(spec_set=Provider1, name='provider')
+        provider.namespace = '2013.com.canonical.certification'
+        job = JobDefinition({
+            'id': 'audio/playback_thunderbolt',
+            'imports': 'from 2013.com.canonical.plainbox import manifest',
+            'requires': (
+                "device.category == 'AUDIO'\n"
+                "manifest.has_thunderbolt == 'True'\n"),
+        }, provider=provider)
+        prog = job.get_resource_program()
+        self.assertEqual(prog.expression_list[-1].resource_id,
+                         '2013.com.canonical.plainbox::manifest')