Switch to SlapTool way of computer creation.

master/product/Vifib/tests/testVifibSlapAllocationScope.py

@@ -75,7 +75,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     self.computer_partition_amount = 2
     sequence_list = SequenceList()
     sequence_string = self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -170,7 +170,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     self.computer_partition_amount = 3
     sequence_list = SequenceList()
     sequence_string =  self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -273,7 +273,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     self.computer_partition_amount = 2
     sequence_list = SequenceList()
     sequence_string =  self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -345,7 +345,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     to anybody"""
     sequence_list = SequenceList()
     sequence_string =  self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -395,7 +395,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     """Check that computer's allocation scope is not set it is unavailable"""
     sequence_list = SequenceList()
     sequence_string =  self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -442,7 +442,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     sequence_list.play(self)
 
   prepare_open_public_computer = TestVifibSlapWebServiceMixin.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout
@@ -766,7 +766,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
     self.computer_partition_amount = 2
     sequence_list = SequenceList()
     sequence_string = self.stabilise_accounting + """
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
       Logout

master/product/Vifib/tests/testVifibSlapBang.py

@@ -465,9 +465,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
     sequence_string = self.prepare_published_software_release + \
       """
       # prepare first computer
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibCustomer
       SetComputerCoordinatesFromComputerTitle
       StoreComputerCoordinatesAsC1
       ComputerSetAllocationScopeOpenPersonal
@@ -488,9 +490,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
       SlapLogout
 
       # prepare second computer
-      LoginTestVifibCustomer
+      SlapLoginTestVifibCustomer
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibCustomer
       SetComputerCoordinatesFromComputerTitle
       StoreComputerCoordinatesAsC0
       ComputerSetAllocationScopeOpenPersonal

master/product/Vifib/tests/testVifibSlapBug.py

@@ -213,9 +213,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
       Logout
 
       # Create first computer
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -311,9 +313,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
 
       # Now prepare second computer
 
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -534,9 +538,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
       Logout
 
       # Create first computer
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -653,9 +659,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
       Logout
 
       # Create the computer
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -818,9 +826,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
       Logout
 
       # Create the computer
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -990,9 +1000,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
       Logout
 
       # Create the computer
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       Tic
@@ -1540,9 +1552,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
 
       """ + self.stabilise_accounting + """
 
-      LoginWebUser
+      SlapLoginWebUser
       CustomerRegisterNewComputer
       Tic
+      SlapLogout
+      LoginWebUser
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPersonal
       Logout

master/product/Vifib/tests/testVifibSlapComputerPartitionConnection.py

@@ -25,20 +25,7 @@ class TestVifibSlapComputerPartitionConnection(TestVifibSlapWebServiceMixin):
       SetSoftwareProductToSoftwareRelease
       PublishByActionSoftwareRelease
       Logout
-
-      LoginTestVifibAdmin
-      CustomerRegisterNewComputer
-      Tic
-      SetComputerCoordinatesFromComputerTitle
-      ComputerSetAllocationScopeOpenPublic
-      Tic
-      Logout
-
-      SlapLoginCurrentComputer
-      FormatComputer
-      Tic
-      SlapLogout
-
+      """ + self.prepare_formated_computer + """
       LoginTestVifibAdmin
       RequestSoftwareInstallation
       Tic

master/product/Vifib/tests/testVifibSlapComputerPartitionError.py

@@ -14,9 +14,11 @@ class TestVifibSlapComputerPartitionError(TestVifibSlapWebServiceMixin):
     """
     sequence_list = SequenceList()
     sequence_string = '\
-      LoginTestVifibAdmin \
+      SlapLoginTestVifibAdmin \
       CustomerRegisterNewComputer \
       Tic \
+      SlapLogout \
+      LoginTestVifibAdmin \
       SetComputerCoordinatesFromComputerTitle \
       ComputerSetAllocationScopeOpenPublic \
       Tic \

master/product/Vifib/tests/testVifibSlapRegisterComputer.py

@@ -60,9 +60,11 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
     """
     sequence_list = SequenceList()
     sequence_string = self.stabilise_accounting + '\
-      LoginTestVifibAdmin \
+      SlapLoginTestVifibAdmin \
       CustomerRegisterNewComputer \
       Tic \
+      SlapLogout \
+      SlapLoginTestVifibAdmin \
       SetComputerCoordinatesFromComputerTitle \
       ComputerSetAllocationScopeOpenPublic \
       Tic \
@@ -84,17 +86,21 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
     """
     sequence_list = SequenceList()
     sequence_string = self.stabilise_accounting + '\
-      LoginTestVifibAdmin \
+      SlapLoginTestVifibAdmin \
       CustomerRegisterNewComputer \
       Tic \
+      SlapLogout \
+      LoginTestVifibAdmin \
       SetComputerCoordinatesFromComputerTitle \
       ComputerSetAllocationScopeOpenPublic \
       Tic \
       Logout \
       \
-      LoginTestVifibAdmin \
+      SlapLoginTestVifibAdmin \
       CustomerRegisterNewComputer \
       Tic \
+      SlapLogout \
+      LoginTestVifibAdmin \
       SetComputerCoordinatesFromComputerTitle \
       ComputerSetAllocationScopeOpenPublic \
       Tic \

master/product/Vifib/tests/testVifibSlapRegisterSoftwareRelease.py

@@ -14,9 +14,11 @@ class TestVifibSlapRegisterSoftwareRelease(TestVifibSlapWebServiceMixin):
     """
     sequence_list = SequenceList()
     sequence_string = self.prepare_computer + '\
-      LoginTestVifibAdmin \
+      SlapLoginTestVifibAdmin \
       CustomerRegisterNewComputer \
       Tic \
+      SlapLogout \
+      LoginTestVifibAdmin \
       SetComputerCoordinatesFromComputerTitle \
       ComputerSetAllocationScopeOpenPublic \
       Tic \

master/product/Vifib/tests/testVifibSlapWebService.py

@@ -667,14 +667,10 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     )
 
   def stepCustomerRegisterNewComputer(self, sequence, **kw):
+    self.slap = slap.slap()
+    self.slap.initializeConnection(self.server_url, timeout=None)
     sequence['computer_title'] = str(random())
-    request = self.app.REQUEST
-    self.getPortal().portal_skins.changeSkin("Hosting")
-    request.set('portal_skin', "Hosting")
-    self.portal.web_site_module.hosting.WebSection_registerNewComputer(
-      title=sequence['computer_title'])
-    self.getPortal().portal_skins.changeSkin("View")
-    request.set('portal_skin', "View")
+    self.slap.requestComputer(sequence['computer_title'])
 
   def stepSetComputerCoordinatesFromComputerTitle(self, sequence, **kw):
     computer = self.portal.portal_catalog.getResultValue(
@@ -920,9 +916,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
   """
 
   prepare_computer = stabilise_accounting + """
-      LoginTestVifibAdmin
+      SlapLoginTestVifibAdmin
       CustomerRegisterNewComputer
       CleanTic
+      SlapLogout
+      LoginTestVifibAdmin
       SetComputerCoordinatesFromComputerTitle
       ComputerSetAllocationScopeOpenPublic
       CleanTic
@@ -1140,9 +1138,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
 
   prepare_another_computer_sequence_string = """
     StoreComputerReference
-    LoginTestVifibAdmin
+    SlapLoginTestVifibAdmin
     CustomerRegisterNewComputer
     Tic
+    SlapLogout
+    LoginTestVifibAdmin
     SetComputerCoordinatesFromComputerTitle
     ComputerSetAllocationScopeOpenPublic
     Tic