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
20
Merge Requests
20
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
88e51bd2
Commit
88e51bd2
authored
Sep 27, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Workaround the asynchronous cache in getFullComputerInformation"
This reverts commit
7ea34e36
.
parent
80bfb0fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
29 deletions
+0
-29
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+0
-29
No files found.
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
88e51bd2
...
@@ -117,42 +117,13 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -117,42 +117,13 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
def
unfakeSlapAuth
(
self
):
def
unfakeSlapAuth
(
self
):
unfakeSlapAuth
()
unfakeSlapAuth
()
def
fakeGetComputerInformation
(
self
):
from
slapos.slap.slap
import
ConnectionHelper
,
ServerError
if
getattr
(
ConnectionHelper
,
'_oldGetFullComputerInformation'
,
None
)
is
None
:
ConnectionHelper
.
_oldGetFullComputerInformation
=
\
ConnectionHelper
.
getFullComputerInformation
running_test
=
self
def
monkeyPatchedGetFullComputerInformation
(
self
,
computer_id
):
try
:
return
self
.
_oldGetFullComputerInformation
(
computer_id
)
except
ServerError
:
transaction
.
commit
()
running_test
.
stepCleanTic
()
transaction
.
commit
()
return
self
.
_oldGetFullComputerInformation
(
computer_id
)
ConnectionHelper
.
getFullComputerInformation
=
\
monkeyPatchedGetFullComputerInformation
def
unfakeGetComputerInformation
(
self
):
from
slapos.slap.slap
import
ConnectionHelper
if
getattr
(
ConnectionHelper
,
'_oldGetFullComputerInformation'
,
None
)
\
is
not
None
:
ConnectionHelper
.
getFullComputerInformation
=
\
ConnectionHelper
.
_oldGetFullComputerInformation
delattr
(
ConnectionHelper
,
'_oldGetFullComputerInformation'
,)
def
afterSetUp
(
self
):
def
afterSetUp
(
self
):
self
.
fakeSlapAuth
()
self
.
fakeSlapAuth
()
self
.
fakeGetComputerInformation
()
testVifibMixin
.
afterSetUp
(
self
)
testVifibMixin
.
afterSetUp
(
self
)
self
.
server_url
=
self
.
portal
.
portal_slap
.
absolute_url
()
self
.
server_url
=
self
.
portal
.
portal_slap
.
absolute_url
()
def
beforeTearDown
(
self
):
def
beforeTearDown
(
self
):
self
.
unfakeSlapAuth
()
self
.
unfakeSlapAuth
()
self
.
unfakeGetComputerInformation
()
super
(
testVifibMixin
,
self
).
beforeTearDown
()
super
(
testVifibMixin
,
self
).
beforeTearDown
()
def
_loginAsUser
(
self
,
username
):
def
_loginAsUser
(
self
,
username
):
...
...
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