Commit db95cff8 authored by Benjamin Blanc's avatar Benjamin Blanc

Fix bug

parent 97fe2a29
...@@ -67,7 +67,7 @@ class ERP5TestNode(TestCase): ...@@ -67,7 +67,7 @@ class ERP5TestNode(TestCase):
# XXX how to get property the git path ? # XXX how to get property the git path ?
config = {} config = {}
config["git_binary"] = "git" config["git_binary"] = "git"
config["slapos_directory"] = self.working_directory config["slapos_directory"] = self.slapos_directory
config["working_directory"] = self.working_directory config["working_directory"] = self.working_directory
config["node_quantity"] = 3 config["node_quantity"] = 3
config["test_suite_directory"] = self.test_suite_directory config["test_suite_directory"] = self.test_suite_directory
......
...@@ -155,6 +155,22 @@ class ScalabilityTestRunner(): ...@@ -155,6 +155,22 @@ class ScalabilityTestRunner():
self.launchable = test_configuration['launchable'] self.launchable = test_configuration['launchable']
self.error_message = test_configuration['error_message'] self.error_message = test_configuration['error_message']
self.random_path = test_configuration['random_path'] self.random_path = test_configuration['random_path']
# create an obfuscated link to the testsuite directory
self.ofuscated_link_path = os.path.join(
self.testnode.config['link_to_testsuite_directory'],
self.random_path)
path_to_suite = os.path.join(
self.testnode.config['working_directory'],
node_test_suite.reference)
if ( os.path.lexists(self.ofuscated_link_path) or
os.path.exists(self.ofuscated_link_path) ) :
os.remove(self.ofuscated_link_path)
os.symlink(path_to_suite, self.ofuscated_link_path)
if not self.launchable: if not self.launchable:
self.testnode.log("Test suite %s is not actually launchable with \ self.testnode.log("Test suite %s is not actually launchable with \
the current cluster configuration." %(node_test_suite.test_suite_title,)) the current cluster configuration." %(node_test_suite.test_suite_title,))
......
...@@ -87,11 +87,8 @@ class SlapOSControler(object): ...@@ -87,11 +87,8 @@ class SlapOSControler(object):
slapos_account_certificate_path, slapos_account_certificate_path,
slapos_account_key_path) slapos_account_key_path)
createFile(slapos_account_key_path, "w", key) createFile(slapos_account_key_path, "w", key)
self.log("%s created." %(str(slapos_account_key_path)))
createFile(slapos_account_certificate_path, "w", certificate) createFile(slapos_account_certificate_path, "w", certificate)
self.log("%s created." %(str(slapos_account_certificate_path)))
createFile(configuration_file_path, "w", configuration_file_value) createFile(configuration_file_path, "w", configuration_file_value)
self.log("%s created." %(str(configuration_file_path)))
self.configuration_file_path = configuration_file_path self.configuration_file_path = configuration_file_path
def supply(self, software_url, computer_id, state="available"): def supply(self, software_url, computer_id, state="available"):
......
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