Merge remote-tracking branch 'rafael/master'

master/product/SlapOS/tests/testSlapOSUpgradeInstanceWithOldDataFs.py

@@ -30,8 +30,20 @@ from testSlapOSMixin import testSlapOSMixin
 import unittest
 
 class TestUpgradeInstanceWithOldDataFs(testSlapOSMixin):
+  def afterSetUp(self):
+    # Do nothing as all work is done on the saved testSlapOSMixin already
+    # When save the data.fs
+    pass
+
+  def getBusinessTemplateList(self):
+    # we dont need bt5 as this test is supposed to run only as --load
+    return ['erp5_core']
 
   def testUpgrade(self):
+    if not self.portal.portal_templates.getRepositoryList():
+      self.setupAutomaticBusinessTemplateRepository(
+        searchable_business_template_list=["erp5_core", "erp5_base",
+                                           "slapos_erp5", "erp5_slapos_tutorial"])
 
     alarm = self.portal.portal_alarms.promise_check_upgrade
     alarm.solve()