From 88e51bd2df31c3468766fd194c584535a8472e9a Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Thu, 27 Sep 2012 17:47:49 +0200
Subject: [PATCH] Revert "Workaround the asynchronous cache in
getFullComputerInformation"
This reverts commit 7ea34e36f6ca9f5eaecb8f4b5d20146ad152e746.
---
.../Vifib/tests/testVifibSlapWebService.py | 29 -------------------
1 file changed, 29 deletions(-)
diff --git a/master/product/Vifib/tests/testVifibSlapWebService.py b/master/product/Vifib/tests/testVifibSlapWebService.py
index 8c66f451d..578018ef6 100644
--- a/master/product/Vifib/tests/testVifibSlapWebService.py
+++ b/master/product/Vifib/tests/testVifibSlapWebService.py
@@ -117,42 +117,13 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
def unfakeSlapAuth(self):
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):
self.fakeSlapAuth()
- self.fakeGetComputerInformation()
testVifibMixin.afterSetUp(self)
self.server_url = self.portal.portal_slap.absolute_url()
def beforeTearDown(self):
self.unfakeSlapAuth()
- self.unfakeGetComputerInformation()
super(testVifibMixin, self).beforeTearDown()
def _loginAsUser(self, username):
--
2.30.9