Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
27daa8a4
Commit
27daa8a4
authored
Nov 20, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop name clash.
parent
9250fc4b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingAlarm.py
..._accounting/TestTemplateItem/testSlapOSAccountingAlarm.py
+2
-2
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingRule.py
...s_accounting/TestTemplateItem/testSlapOSAccountingRule.py
+2
-2
master/bt5/slapos_accounting/bt/revision
master/bt5/slapos_accounting/bt/revision
+1
-1
No files found.
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingAlarm.py
View file @
27daa8a4
...
@@ -1227,7 +1227,7 @@ if context.getTitle() == 'Not visited by SimulationMovement_buildSlapOS':
...
@@ -1227,7 +1227,7 @@ if context.getTitle() == 'Not visited by SimulationMovement_buildSlapOS':
transaction
.
commit
()
transaction
.
commit
()
return
wrapped
return
wrapped
class
TestAlarm
(
testSlapOSMixin
):
class
Test
SlapOSTriggerBuild
Alarm
(
testSlapOSMixin
):
@
simulateSimulationMovement_buildSlapOS
@
simulateSimulationMovement_buildSlapOS
def
test_SimulationMovement_withoutDelivery
(
self
):
def
test_SimulationMovement_withoutDelivery
(
self
):
applied_rule
=
self
.
portal
.
portal_simulation
.
newContent
(
applied_rule
=
self
.
portal
.
portal_simulation
.
newContent
(
...
@@ -1452,7 +1452,7 @@ if context.getTitle() == 'Not visited by Delivery_manageBuildingCalculatingDeliv
...
@@ -1452,7 +1452,7 @@ if context.getTitle() == 'Not visited by Delivery_manageBuildingCalculatingDeliv
transaction
.
commit
()
transaction
.
commit
()
return
wrapped
return
wrapped
class
TestAlarm
(
testSlapOSMixin
):
class
Test
SlapOSManageBuildingCalculatingDelivery
Alarm
(
testSlapOSMixin
):
@
simulateDelivery_manageBuildingCalculatingDelivery
@
simulateDelivery_manageBuildingCalculatingDelivery
def
_test
(
self
,
state
,
message
):
def
_test
(
self
,
state
,
message
):
delivery
=
self
.
portal
.
sale_packing_list_module
.
newContent
(
delivery
=
self
.
portal
.
sale_packing_list_module
.
newContent
(
...
...
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingRule.py
View file @
27daa8a4
...
@@ -253,7 +253,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
...
@@ -253,7 +253,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
SimulationMovement
.
getSimulationState
=
SimulationMovement
\
SimulationMovement
.
getSimulationState
=
SimulationMovement
\
.
original_getSimulationState
.
original_getSimulationState
class
TestDefault
InvoiceTransaction
Rule
(
testSlapOSMixin
):
class
TestDefault
Payment
Rule
(
testSlapOSMixin
):
@
withAbort
@
withAbort
def
test_simulation
(
self
):
def
test_simulation
(
self
):
from
Products.ERP5.Document.SimulationMovement
import
SimulationMovement
from
Products.ERP5.Document.SimulationMovement
import
SimulationMovement
...
@@ -600,7 +600,7 @@ class TestHostingSubscriptionSimulation(testSlapOSMixin):
...
@@ -600,7 +600,7 @@ class TestHostingSubscriptionSimulation(testSlapOSMixin):
SimulationMovement
.
isFrozen
=
SimulationMovement
.
originalIsFrozen
SimulationMovement
.
isFrozen
=
SimulationMovement
.
originalIsFrozen
delattr
(
SimulationMovement
,
'originalIsFrozen'
)
delattr
(
SimulationMovement
,
'originalIsFrozen'
)
class
TestDefault
InvoiceTransaction
Rule
(
testSlapOSMixin
):
class
TestDefault
TradeModel
Rule
(
testSlapOSMixin
):
@
withAbort
@
withAbort
def
test_simulation
(
self
):
def
test_simulation
(
self
):
from
Products.ERP5.Document.SimulationMovement
import
SimulationMovement
from
Products.ERP5.Document.SimulationMovement
import
SimulationMovement
...
...
master/bt5/slapos_accounting/bt/revision
View file @
27daa8a4
94
95
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment