Merge ~sylvain-pineau/checkbox-ng:preserve-bootstrap-ordering into checkbox-ng:master

[Sylvain Pineau]

Sets didn't preserve the bootstrap job ordering. this patch fixes the problem

[Maciej Kisielewski (kissiel)]

Thanks for fixing that! +1

review: Approve

diff --git a/plainbox/impl/unit/test_testplan.py b/plainbox/impl/unit/test_testplan.py
index 090ed2c..f9fb530 100644
--- a/plainbox/impl/unit/test_testplan.py
+++ b/plainbox/impl/unit/test_testplan.py
@@ -372,20 +372,19 @@ class TestTestPlan(TestCase):
 
     def test_get_bootstrap_job_ids__empty(self):
         unit = TestPlanUnit({}, provider=None)
-        self.assertEqual(unit.get_bootstrap_job_ids(), set())
+        self.assertEqual(unit.get_bootstrap_job_ids(), list())
 
     def test_get_bootstrap_job_ids__normal(self):
         unit = TestPlanUnit({
             'bootstrap_include': 'Foo\nBar'
         }, provider=None)
-        self.assertEqual(unit.get_bootstrap_job_ids(), set(['Foo', 'Bar']))
+        self.assertEqual(unit.get_bootstrap_job_ids(), ['Foo', 'Bar'])
 
     def test_get_bootstrap_job_ids__qualified_ids(self):
         unit = TestPlanUnit({
             'bootstrap_include': 'Foo\nBar'
         }, provider=self.provider)
-        self.assertEqual(unit.get_bootstrap_job_ids(),
-                         set(['ns::Foo', 'ns::Bar']))
+        self.assertEqual(unit.get_bootstrap_job_ids(), ['ns::Foo', 'ns::Bar'])
 
 
 class TestNestedTestPlan(TestCase):
diff --git a/plainbox/impl/unit/testplan.py b/plainbox/impl/unit/testplan.py
index b0664ae..a5d9ebc 100644
--- a/plainbox/impl/unit/testplan.py
+++ b/plainbox/impl/unit/testplan.py
@@ -319,13 +319,13 @@ class TestPlanUnit(UnitWithId):
     @instance_method_lru_cache(maxsize=None)
     def get_bootstrap_job_ids(self):
         """Compute and return a set of job ids from bootstrap_include field."""
-        job_ids = set()
+        job_ids = []
         if self.bootstrap_include is not None:
 
             class V(Visitor):
 
                 def visit_Text_node(visitor, node: Text):
-                    job_ids.add(self.qualify_id(node.text))
+                    job_ids.append(self.qualify_id(node.text))
 
                 def visit_Error_node(visitor, node: Error):
                     logger.warning(_(
@@ -333,7 +333,7 @@ class TestPlanUnit(UnitWithId):
 
             V().visit(WordList.parse(self.bootstrap_include))
         for tp_unit in self.get_nested_part():
-            job_ids |= tp_unit.get_bootstrap_job_ids()
+            job_ids.extend(tp_unit.get_bootstrap_job_ids())
         return job_ids
 
     @instance_method_lru_cache(maxsize=None)