Skip to content

S
slapos.core
Commit a6c4749f authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Improve readability of alarm calling. 

As in testVifibDefaultUseCase there was more and more Tic one after another
start to replace them with Call...Alarm with CleanTic. This will show expected
states of system in case of playing scenario.

Add magical method to generate the alarms and reuse it everywhere.

Note: stepTic still calls all possible alarms.
parent 54625349
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 219 deletions
master/product/Vifib/tests/VifibMixin.py
View file @ a6c4749f
......@@ -33,6 +33,7 @@ from AccessControl.SecurityManagement import newSecurityManager, \
from Products.ERP5Type.tests.utils import DummyMailHost
import os
from DateTime import DateTime
from Products.ERP5Type.Utils import convertToUpperCase
class testVifibMixin(ERP5TypeTestCase):
"""
......@@ -157,6 +158,22 @@ class testVifibMixin(ERP5TypeTestCase):
'01')
open(os.path.join(os.environ['TEST_CA_PATH'], 'index.txt'), 'w').write('')
def createAlarmStep(self):
def makeCallAlarm(alarm):
def callAlarm(*args, **kwargs):
sm = getSecurityManager()
self.login()
try:
alarm.activeSense()
transaction.commit()
finally:
setSecurityManager(sm)
return callAlarm
for alarm in self.portal.portal_alarms.contentValues():
if alarm.isEnabled():
setattr(self, 'stepCall' + convertToUpperCase(alarm.getId()) \
+ 'Alarm', makeCallAlarm(alarm))
def afterSetUp(self, quiet=1, run=run_all_test):
"""
Create ERP5 user.
......@@ -176,6 +193,7 @@ class testVifibMixin(ERP5TypeTestCase):
self.portal.portal_caches._p_changed = 1
transaction.commit()
self.portal.portal_caches.updateCache()
self.createAlarmStep()
if getattr(self.portal, 'set_up_once_called', 0):
return
else:
......@@ -343,14 +361,6 @@ class testVifibMixin(ERP5TypeTestCase):
def stepLogout(self, **kw):
self.logout()
def stepTriggerBuild(self, **kw):
sm = getSecurityManager()
self.login()
try:
self.portal.portal_alarms.vifib_trigger_build.activeSense()
finally:
setSecurityManager(sm)
def checkDivergency(self):
# there shall be no divergency
current_skin = self.app.REQUEST.get('portal_skin', 'View')
......
master/product/Vifib/tests/testVifibDefaultUseCase.py
View file @ a6c4749f
......@@ -973,8 +973,6 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
self.register_new_user_sequence_string + '\
LoginWebUser \
CheckRegistrationAccounting \
Logout \
LoginDefaultUser \
PayRegistrationPayment \
Tic \
Logout \
......@@ -987,14 +985,20 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
SoftwareInstanceAvailable \
Tic \
SlapLogout \
LoginERP5TypeTestCase \
TriggerBuild \
Tic \
TriggerStopConfirmedInvoiceAlarm \
Tic \
TriggerBuild \
Tic \
Logout \
\
CallVifibTriggerBuildAlarm \
CleanTic \
CallVifibUpdateDeliveryCausalityStateAlarm\
CleanTic \
CallDeliverSubscriptionSalePackingListAlarm \
CleanTic \
CallVifibExpandDeliveryLineAlarm \
CleanTic \
CallVifibTriggerBuildAlarm \
CleanTic \
CallVifibUpdateDeliveryCausalityStateAlarm \
CleanTic \
\
LoginWebUser \
CheckSetupOngoingInvoice \
RequestSoftwareInstanceStart \
......@@ -1012,14 +1016,14 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
SoftwareInstanceStopped \
Tic \
Logout \
LoginERP5TypeTestCase \
TriggerBuild \
Tic \
TriggerStopConfirmedInvoiceAlarm \
Tic \
TriggerBuild \
Tic \
Logout \
\
CallVifibTriggerBuildAlarm \
CleanTic \
CallStopConfirmedSaleInvoiceTransactionAlarm \
CleanTic \
CallVifibTriggerBuildAlarm \
CleanTic \
\
LoginWebUser \
CheckHostingOngoingInvoice \
\
......@@ -1029,7 +1033,6 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
SlapLoginCurrentComputer \
SoftwareInstanceDestroyed \
Tic \
Tic \
SlapLogout \
\
LoginDefaultUser \
......@@ -1038,6 +1041,11 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
CheckOpenOrderLineRemoved \
Logout \
\
CallVifibTriggerBuildAlarm \
CleanTic \
CallVifibUpdateDeliveryCausalityStateAlarm \
CleanTic \
\
LoginWebUser \
CheckDestroyOngoingInvoice \
SlapLogout \
......@@ -1045,9 +1053,20 @@ class TestVifibDefaultUseCase(TestVifibSlapWebServiceMixin):
LoginERP5TypeTestCase \
ConfirmOngoingInvoice \
Tic \
Tic \
\
SlapLogout \
Tic \
CallVifibUpdateDeliveryCausalityStateAlarm \
CleanTic \
CallStopConfirmedSaleInvoiceTransactionAlarm \
CleanTic \
CallVifibExpandDeliveryLineAlarm \
CleanTic \
CallVifibTriggerBuildAlarm \
CleanTic \
CallVifibUpdateDeliveryCausalityStateAlarm\
CleanTic \
\
LoginWebUser \
CheckWaitingInvoice \
Tic \
......
master/product/Vifib/tests/testVifibInstanceHostingRelatedDocument.py
View file @ a6c4749f
......@@ -567,11 +567,11 @@ class TestVifibInstanceHostingRelatedDocument(TestVifibSlapWebServiceMixin):
self.prepare_installed_computer_partition_sequence_string + \
"""
LoginDefaultUser
TriggerBuild
CallVifibTriggerBuildAlarm
Tic
CheckSubscriptionSalePackingListCoverage
TriggerBuild
CallVifibTriggerBuildAlarm
Tic
# Nothing shall change
CheckHostingSubscriptionInitialDocumentCoverage
......@@ -582,15 +582,15 @@ class TestVifibInstanceHostingRelatedDocument(TestVifibSlapWebServiceMixin):
SelectNextSubscriptionDelivery
Tic
TriggerBuild
CallVifibTriggerBuildAlarm
Tic
CheckHostingSubscriptionStoppedDocumentCoverage
# proff that alarm will ignore this month invoices
TriggerConfirmPlannedInvoiceAlarm
CallConfirmPlannedSaleInvoiceTransactionAlarm
Tic
TriggerStopConfirmedInvoiceAlarm
CallStopConfirmedSaleInvoiceTransactionAlarm
Tic
CheckHostingSubscriptionStoppedDocumentCoverage
......@@ -609,7 +609,7 @@ class TestVifibInstanceHostingRelatedDocument(TestVifibSlapWebServiceMixin):
# SelectNextSubscriptionDelivery
# Tic
#
# TriggerBuild
# CallVifibTriggerBuildAlarm
# Tic
#
# CheckHostingSubscriptionConfirmedInvoiceDocumentCoverage
......@@ -620,7 +620,7 @@ class TestVifibInstanceHostingRelatedDocument(TestVifibSlapWebServiceMixin):
# StopInvoice
# Tic
#
# TriggerBuild
# CallVifibTriggerBuildAlarm
# Tic
#
# CheckHostingSubscriptionStoppedInvoiceDocumentCoverage
......@@ -629,13 +629,13 @@ class TestVifibInstanceHostingRelatedDocument(TestVifibSlapWebServiceMixin):
# SelectPlannedInvoice
# InvoiceSetStartDatePreviousMonth
# Tic
# TriggerConfirmPlannedInvoiceAlarm
# CallConfirmPlannedSaleInvoiceTransactionAlarm
# Tic
# TriggerStopConfirmedInvoiceAlarm
# CallStopConfirmedSaleInvoiceTransactionAlarm
# Tic
#
# # Payment should cover both invoices
# TriggerBuild
# CallVifibTriggerBuildAlarm
# Tic
#
# CheckHostingSubscriptionTwoStoppedInvoiceDocumentCoverage
......
master/product/Vifib/tests/testVifibSlapAllocationScope.py
View file @ a6c4749f
......@@ -105,7 +105,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -122,7 +122,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# fail to instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckNoRelatedSalePackingListLineForSoftwareInstance
Logout
......@@ -135,7 +135,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -204,7 +204,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -221,7 +221,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for friend
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -238,7 +238,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# fail to instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckNoRelatedSalePackingListLineForSoftwareInstance
Logout
......@@ -251,7 +251,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for friend
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -307,7 +307,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -324,7 +324,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -379,7 +379,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# fail to instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckNoRelatedSalePackingListLineForSoftwareInstance
Logout
......@@ -429,7 +429,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# fail to instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckNoRelatedSalePackingListLineForSoftwareInstance
Logout
......@@ -481,7 +481,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -499,7 +499,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSoftwareInstanceAndRelatedComputerPartition
CheckRequestedSoftwareInstanceAndRelatedComputerPartition
......@@ -530,7 +530,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -597,7 +597,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for friend
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -616,7 +616,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -652,7 +652,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSoftwareInstanceAndRelatedComputerPartition
CheckRequestedSoftwareInstanceAndRelatedComputerPartition
......@@ -683,7 +683,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -727,7 +727,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -804,7 +804,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for owner
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -821,7 +821,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
# instantiate for someone else
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......
master/product/Vifib/tests/testVifibSlapBang.py
View file @ a6c4749f
......@@ -25,7 +25,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
root_software_instance.requestSoftwareInstance(partition_reference=S1,
**common_kw)
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
S1_instance = self.portal.portal_catalog.getResultValue(
......@@ -33,13 +33,13 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
S1_instance.requestSoftwareInstance(partition_reference=S2, **common_kw)
self.stepTic()
S1_instance.requestSoftwareInstance(partition_reference=S3, **common_kw)
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
root_software_instance.requestSoftwareInstance(partition_reference=S4,
**common_kw)
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
S2_instance = self.portal.portal_catalog.getResultValue(
......@@ -390,7 +390,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
</instance>""" % sequence['computer_reference_c1'],
**common_kw)
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
self.logout()
......@@ -408,7 +408,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
</instance>""" % sequence['computer_reference_c0'],
**common_kw)
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
self.logout()
......@@ -430,7 +430,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
self.logout()
self.stepLoginDefaultUser()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
S3_instance = self.portal.portal_catalog.getResultValue(
portal_type='Software Instance', title=S3)
......@@ -531,7 +531,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -661,7 +661,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
partition_reference=S1,
**common_kw)
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
self.logout()
......@@ -782,7 +782,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
Logout
SlapLoginCurrentSoftwareInstance
Bang
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
SlapLogout
Tic
LoginTestVifibCustomer
......@@ -874,7 +874,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
RenameCurrentSoftwareInstanceDead
Tic
Bang
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLogout
......@@ -898,7 +898,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......@@ -910,7 +910,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......@@ -996,7 +996,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
CheckRaisesNotFoundComputerPartitionParameterDict
Tic
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......@@ -1006,7 +1006,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
RenameCurrentSoftwareInstanceDead
Tic
Bang
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLogout
......@@ -1020,7 +1020,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......@@ -1031,7 +1031,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......@@ -1043,7 +1043,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
......
master/product/Vifib/tests/testVifibSlapBug.py
View file @ a6c4749f
......@@ -276,7 +276,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -377,7 +377,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentSoftwareInstance
RequestComputerPartition
......@@ -649,7 +649,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -768,7 +768,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -786,7 +786,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -816,7 +816,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -933,7 +933,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -950,7 +950,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -980,7 +980,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -1105,7 +1105,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -1122,7 +1122,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -1236,7 +1236,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -1304,7 +1304,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -1347,7 +1347,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -1392,7 +1392,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -1463,7 +1463,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -1509,7 +1509,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -1604,16 +1604,16 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
LoginDefaultUser
SubmitCredentialRequest
Tic
AcceptSubmittedCredentialsActiveSense
CallAcceptSubmittedCredentialsAlarm
Tic
Logout
LoginERP5TypeTestCase
TriggerBuild
CallVifibTriggerBuildAlarm
Tic
TriggerStopConfirmedInvoiceAlarm
CallStopConfirmedSaleInvoiceTransactionAlarm
Tic
TriggerBuild
CallVifibTriggerBuildAlarm
Tic
PayRegistrationPayment
Tic
......@@ -1648,7 +1648,7 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......
master/product/Vifib/tests/testVifibSlapComputerGetComputerPartitionList.py
View file @ a6c4749f
......@@ -329,7 +329,7 @@ class TestVifibSlapComputerGetComputerPartitionList(TestVifibSlapWebServiceMixin
SlapLogout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckComputerPartitionInstanceSetupSalePackingListConfirmed \
Logout \
......@@ -358,7 +358,7 @@ class TestVifibSlapComputerGetComputerPartitionList(TestVifibSlapWebServiceMixin
SlapLogout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
SetDeliveryLineAmountEqualOne \
CheckComputerPartitionInstanceSetupSalePackingListConfirmed \
......
master/product/Vifib/tests/testVifibSlapComputerPartitionConnection.py
View file @ a6c4749f
......@@ -55,7 +55,7 @@ class TestVifibSlapComputerPartitionConnection(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckGetSetConnectionDict
......
master/product/Vifib/tests/testVifibSlapComputerPartitionLock.py
View file @ a6c4749f
......@@ -8,11 +8,11 @@ class TestVifibSlapComputerPartitionLock(TestVifibSlapWebServiceMixin):
lock_user_sequence_string = '\
LoginERP5TypeTestCase \
TriggerBuild \
CallVifibTriggerBuildAlarm \
Tic \
TriggerStopConfirmedInvoiceAlarm \
CallStopConfirmedSaleInvoiceTransactionAlarm \
Tic \
TriggerBuild \
CallVifibTriggerBuildAlarm \
Tic \
Logout'
......@@ -65,7 +65,7 @@ class TestVifibSlapComputerPartitionLock(TestVifibSlapWebServiceMixin):
\
LoginDefaultUser \
SoftwareInstanceSaleOrderConfirmRaisesUnauthorized \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
AssertNoComputerPartition \
Logout \
......@@ -94,7 +94,7 @@ class TestVifibSlapComputerPartitionLock(TestVifibSlapWebServiceMixin):
\
LoginDefaultUser \
SoftwareInstanceSaleOrderConfirmRaisesUnauthorized \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
AssertNoComputerPartition \
Logout \
......
master/product/Vifib/tests/testVifibSlapComputerPartitionRequest.py
View file @ a6c4749f
......@@ -46,7 +46,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
SlapLogout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -89,7 +89,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
SlapLogout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -160,7 +160,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -241,7 +241,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -253,7 +253,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
CheckRequestedComputerPartitionCleanParameterList \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
LoginDefaultUser \
SetCurrentSoftwareInstanceRequested \
......@@ -471,7 +471,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
SlapLogout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -506,7 +506,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckSoftwareInstanceAndRelatedComputerPartition \
CheckRequestedSoftwareInstanceAndRelatedComputerPartition \
......@@ -580,7 +580,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestComputerPartition
......@@ -613,7 +613,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestComputerPartition
......@@ -676,7 +676,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestSlaveInstanceFromComputerPartition
......@@ -708,7 +708,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestSlaveInstanceFromComputerPartition
......@@ -804,7 +804,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -826,7 +826,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestComputerPartition
......@@ -997,7 +997,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
CheckSlaveInstanceListFromOneComputerPartition
......@@ -1031,7 +1031,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentSoftwareInstance
......@@ -1085,7 +1085,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
CheckSlaveInstanceListFromOneComputerPartition
......@@ -1096,7 +1096,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
CheckSlaveInstanceListFromOneComputerPartition
......@@ -1132,7 +1132,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
LoginDefaultUser
SelectSlaveInstanceFromSaleOrderOrdered
SoftwareInstanceSaleOrderLineNoPartitionFound
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetDeliveryLineAmountEqualZero
CheckComputerPartitionInstanceSetupSalePackingListConfirmed
......@@ -1157,7 +1157,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
"""
......@@ -1263,7 +1263,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
SetDeliveryLineAmountEqualOne \
CheckComputerPartitionInstanceSetupSalePackingListConfirmed \
......@@ -1276,7 +1276,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
CheckComputerPartitionInstanceSetupSalePackingListConfirmed \
Logout \
......@@ -1347,7 +1347,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
SlapLoginTestVifibCustomer \
......@@ -1374,7 +1374,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
RequestSlaveInstanceFromComputerPartition \
Tic \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
RequestSlaveInstanceFromComputerPartition \
......@@ -1434,7 +1434,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
SlapLoginCurrentComputer \
CheckSlaveInstanceListFromOneComputerPartition \
......@@ -1452,7 +1452,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
Tic \
SlapLogout \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
SlapLoginTestVifibCustomer \
......@@ -1479,7 +1479,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
RequestSlaveInstanceFromComputerPartition \
Tic \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
RequestSlaveInstanceFromComputerPartition \
......@@ -1575,7 +1575,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
RequestComputerPartition \
Tic \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
RequestComputerPartition \
......@@ -1585,7 +1585,7 @@ class TestVifibSlapComputerPartitionRequest(TestVifibSlapWebServiceMixin):
RequestComputerPartitionWithAnotherSoftwareType \
Tic \
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
Logout \
CheckRequestComputerPartitionWithAnotherSoftwareType \
......
master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py
View file @ a6c4749f
......@@ -45,7 +45,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -327,7 +327,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......
master/product/Vifib/tests/testVifibSlapOpenOrderRequest.py
View file @ a6c4749f
......@@ -41,7 +41,7 @@ class TestVifibSlapOpenOrderRequest(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -97,7 +97,7 @@ class TestVifibSlapOpenOrderRequest(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -152,7 +152,7 @@ class TestVifibSlapOpenOrderRequest(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......@@ -248,7 +248,7 @@ class TestVifibSlapOpenOrderRequest(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
......
master/product/Vifib/tests/testVifibSlapWebService.py
View file @ a6c4749f
......@@ -29,7 +29,7 @@
##############################################################################
from DateTime import DateTime
from AccessControl.SecurityManagement import newSecurityManager, \
getSecurityManager, setSecurityManager
getSecurityManager
from Products.ERP5Type.Errors import UnsupportedWorkflowMethod
from Products.ERP5Type.tests.Sequence import SequenceList
from Products.ERP5Type.tests.backportUnittest import skip
......@@ -267,22 +267,6 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
def stepCheckSoftwareReleaseNotInPublicTable(self, sequence, **kw):
self.assertEqual(0, self._getSoftwareReleasePublicTableAmount(sequence))
def stepTriggerConfirmPlannedInvoiceAlarm(self, sequence, **kw):
sm = getSecurityManager()
self.login()
try:
self.portal.portal_alarms.confirm_planned_sale_invoice_transaction.activeSense()
finally:
setSecurityManager(sm)
def stepTriggerStopConfirmedInvoiceAlarm(self, sequence, **kw):
sm = getSecurityManager()
self.login()
try:
self.portal.portal_alarms.stop_confirmed_sale_invoice_transaction.activeSense()
finally:
setSecurityManager(sm)
def stepCheckComputerTradeConditionDestinationSectionTestVifibCustomer(
self, sequence, **kw):
computer = self.portal.portal_catalog.getResultValue(
......@@ -365,8 +349,6 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
software_instance_reference=software_instance.getReference())
def stepSetCurrentPersonSlapRequestedSoftwareInstance(self, sequence, **kw):
cleanup_resource = self.portal.portal_preferences\
.getPreferredInstanceCleanupResource()
software_instance_list = []
for software_instance in self.portal.portal_catalog(
portal_type=self.software_instance_portal_type,
......@@ -937,15 +919,6 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
sequence['computer_partition_reference'])
computer_partition.building()
def stepConfirmOrderedSaleOrderActiveSense(self, **kw):
sm = getSecurityManager()
self.login()
try:
self.portal.portal_alarms.confirm_ordered_sale_order\
.activeSense()
finally:
setSecurityManager(sm)
def stepPayRegistrationPayment(self, sequence, **kw):
"""
"""
......@@ -1124,7 +1097,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
prepare_install_requested_computer_partition_sequence_string = \
prepare_person_requested_software_instance + """
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -1301,7 +1274,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict \
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestComputerPartition \
......@@ -1319,7 +1292,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
Tic
CheckRaisesNotFoundComputerPartitionParameterDict
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
RequestComputerPartition
......@@ -1462,16 +1435,22 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
LoginDefaultUser \
SubmitCredentialRequest \
Tic \
AcceptSubmittedCredentialsActiveSense \
CallAcceptSubmittedCredentialsAlarm \
Tic \
Logout \
LoginERP5TypeTestCase \
TriggerBuild \
CallVifibTriggerBuildAlarm \
Tic \
TriggerStopConfirmedInvoiceAlarm \
CallStopConfirmedSaleInvoiceTransactionAlarm \
Tic \
TriggerBuild \
CallVifibTriggerBuildAlarm \
Tic \
CallVifibExpandDeliveryLineAlarm \
CleanTic \
CallVifibTriggerBuildAlarm \
CleanTic \
CallVifibUpdateDeliveryCausalityStateAlarm \
CleanTic \
Logout'
create_new_user_instance_sequence_string = '\
......@@ -1481,7 +1460,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
Logout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
SetSelectedComputerPartition \
SelectCurrentlyUsedSalePackingListUid \
......@@ -1981,7 +1960,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
software_type, software_type + str(2))
self.stepLoginDefaultUser()
self.stepTic()
self.stepConfirmOrderedSaleOrderActiveSense()
self.stepCallConfirmOrderedSaleOrderAlarm()
self.stepTic()
self.stepLogout()
first = slap_computer_partition.request(software_release,
......@@ -4230,9 +4209,6 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
)
credential_request.submit()
def stepAcceptSubmittedCredentialsActiveSense(self, **kw):
self.portal.portal_alarms.accept_submitted_credentials.activeSense()
def stepLoginWebUser(self, sequence, **kw):
self.login(sequence['web_user'])
......@@ -4374,7 +4350,6 @@ class TestVifibSlapWebService(TestVifibSlapWebServiceMixin):
########################################
def _safe_revoke_certificate(self, person):
from AccessControl import getSecurityManager
user = getSecurityManager().getUser().getId()
try:
self.login('ERP5TypeTestCase')
......@@ -4481,7 +4456,7 @@ class TestVifibSlapWebService(TestVifibSlapWebServiceMixin):
LoginDefaultUser
SubmitCredentialRequest
Tic
AcceptSubmittedCredentialsActiveSense
CallAcceptSubmittedCredentialsAlarm
Tic
PayRegistrationPayment
Tic
......@@ -4493,7 +4468,7 @@ class TestVifibSlapWebService(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -4533,7 +4508,7 @@ class TestVifibSlapWebService(TestVifibSlapWebServiceMixin):
LoginDefaultUser
SubmitCredentialRequest
Tic
AcceptSubmittedCredentialsActiveSense
CallAcceptSubmittedCredentialsAlarm
Tic
Logout
......@@ -4543,7 +4518,7 @@ class TestVifibSlapWebService(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
AcceptSubmittedCredentialsActiveSense
CallAcceptSubmittedCredentialsAlarm
Tic
LoginWebUser
......
master/product/Vifib/tests/testVifibSlapWebServiceSlaveInstance.py
View file @ a6c4749f
......@@ -17,7 +17,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Tic # in order to call real build
CheckComputerPartitionSaleOrderAggregatedList
......@@ -49,7 +49,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSlaveInstanceNotReady
Logout
......@@ -74,7 +74,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Logout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
......@@ -104,7 +104,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
LoginTestVifibCustomer
......@@ -139,7 +139,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
SoftwareInstanceAvailable
......@@ -170,12 +170,12 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
LoginTestVifibCustomer
PersonRequestSoftwareInstance
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
SoftwareInstanceAvailable
......@@ -202,7 +202,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSlaveInstanceNotReady
Logout
......@@ -231,7 +231,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSlaveInstanceReady
CheckSlaveInstanceAllocationWithTwoDifferentSoftwareInstance
......@@ -257,7 +257,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
""" + self.prepare_published_software_release + """
Tic
......@@ -271,13 +271,13 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
SlapLogout
LoginTestVifibCustomer
PersonRequestSoftwareInstance
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SelectDifferentSoftwareReleaseUri
LoginTestVifibCustomer
PersonRequestSlaveInstance
Tic
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckSlaveInstanceAssociationWithSoftwareInstance
SlapLogout
......@@ -308,7 +308,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
CheckTwoSlaveInstanceRequest
SlapLogout
......@@ -341,7 +341,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
SoftwareInstanceAvailable
......@@ -371,7 +371,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
SoftwareInstanceAvailable
......@@ -406,7 +406,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
SlapLoginCurrentComputer
......@@ -453,7 +453,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
SlapLoginCurrentComputer
......@@ -527,7 +527,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
PersonRequestSlaveInstance
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
SlapLoginCurrentComputer
......@@ -587,7 +587,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
LoginTestVifibCustomer
......@@ -625,7 +625,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
LoginTestVifibCustomer
......@@ -663,7 +663,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
LoginTestVifibCustomer
......@@ -702,7 +702,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentComputer
......@@ -753,7 +753,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
LoginTestVifibCustomer
RequestSoftwareInstanceDestroy
......@@ -782,7 +782,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLogout
LoginAsCustomerA
......@@ -791,7 +791,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
SlapLogout
LoginTestVifibCustomer
CheckSlaveInstanceSecurityWithDifferentCustomer
......@@ -820,7 +820,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginCurrentComputer
CheckSlaveInstanceListFromOneComputerPartition
......@@ -848,7 +848,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
StoreSalePackingListLineFromSlaveInstance
StoreSaleOrderFromSlaveInstance
......@@ -882,7 +882,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SlapLoginSoftwareInstanceFromCurrentSoftwareInstance
SetConnectionXmlToSlaveInstance
......@@ -920,7 +920,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
RequestSlaveInstanceFromComputerPartition
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -987,7 +987,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
RequestSlaveInstanceFromComputerPartition
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -1060,7 +1060,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
RequestSlaveInstanceFromComputerPartition
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......@@ -1090,7 +1090,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Logout
Tic
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
SetSelectedComputerPartition
SelectCurrentlyUsedSalePackingListUid
......@@ -1105,7 +1105,7 @@ class TestVifibSlapWebServiceSlaveInstance(TestVifibSlapWebServiceMixin):
Tic
SlapLogout
LoginDefaultUser
ConfirmOrderedSaleOrderActiveSense
CallConfirmOrderedSaleOrderAlarm
Tic
Logout
SlapLoginCurrentSoftwareInstance
......
master/product/Vifib/tests/testVifibUsageReport.py
View file @ a6c4749f
......@@ -58,7 +58,7 @@ class TestVifibUsageReportMixin(TestVifibSlapWebServiceMixin):
Logout \
\
LoginDefaultUser \
ConfirmOrderedSaleOrderActiveSense \
CallConfirmOrderedSaleOrderAlarm \
Tic \
SetSelectedComputerPartition \
SelectCurrentlyUsedSalePackingListUid \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7