From 60637f98b513aa62ef2ac54f10b02b7384ddce29 Mon Sep 17 00:00:00 2001
From: Benjamin Blanc <benjamin.blanc@tiolive.com>
Date: Wed, 10 Jul 2013 11:47:48 +0200
Subject: [PATCH] testnode: Change testnodeUtils.py to Utils.py
---
erp5/util/scalability/runScalabilityTestSuite.py | 4 ++--
erp5/util/testnode/ScalabilityTestRunner.py | 4 ++--
erp5/util/testnode/{testnodeUtils.py => Utils.py} | 0
erp5/util/testnode/testnode.py | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
rename erp5/util/testnode/{testnodeUtils.py => Utils.py} (100%)
diff --git a/erp5/util/scalability/runScalabilityTestSuite.py b/erp5/util/scalability/runScalabilityTestSuite.py
index 764ca1cff9..eba8823ac5 100644
--- a/erp5/util/scalability/runScalabilityTestSuite.py
+++ b/erp5/util/scalability/runScalabilityTestSuite.py
@@ -13,7 +13,7 @@ import logging.handlers
from erp5.util.benchmark.argument import ArgumentType
from erp5.util.benchmark.performance_tester import PerformanceTester
from erp5.util import taskdistribution
-from erp5.util.testnode import testnodeUtils
+from erp5.util.testnode import Utils
from subprocess import call
@@ -120,7 +120,7 @@ class ScalabilityLauncher(object):
data = self.test_result.getNextTestCase()
if data == None :
return None
- decoded_data = testnodeUtils.deunicodeData(json.loads(
+ decoded_data = Utils.deunicodeData(json.loads(
data
))
next_test = ScalabilityTest(decoded_data, self.test_result)
diff --git a/erp5/util/testnode/ScalabilityTestRunner.py b/erp5/util/testnode/ScalabilityTestRunner.py
index b3d70f0dbb..da0ca10ad8 100644
--- a/erp5/util/testnode/ScalabilityTestRunner.py
+++ b/erp5/util/testnode/ScalabilityTestRunner.py
@@ -37,7 +37,7 @@ import shutil
import logging
import string
import random
-import testnodeUtils
+import Utils
from ProcessManager import SubprocessError, ProcessManager, CancellationError
from subprocess import CalledProcessError
from Updater import Updater
@@ -213,7 +213,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
if self.testnode.test_suite_portal.isMasterTestnode(
self.testnode.config['test_node_title']):
# Get from ERP5 Master the configuration of the cluster for the test
- test_configuration = testnodeUtils.deunicodeData(
+ test_configuration = Utils.deunicodeData(
json.loads(self.testnode.test_suite_portal.generateConfiguration(
node_test_suite.test_suite_title)
)
diff --git a/erp5/util/testnode/testnodeUtils.py b/erp5/util/testnode/Utils.py
similarity index 100%
rename from erp5/util/testnode/testnodeUtils.py
rename to erp5/util/testnode/Utils.py
diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py
index 4f35568cc4..997132cc9e 100644
--- a/erp5/util/testnode/testnode.py
+++ b/erp5/util/testnode/testnode.py
@@ -37,7 +37,7 @@ import shutil
import logging
import string
import random
-import testnodeUtils
+import Utils
import traceback
@@ -312,7 +312,7 @@ branch = %(branch)s
self.test_suite_portal = taskdistribution.TaskDistributor(portal_url, logger=DummyLogger(log))
self.test_suite_portal.subscribeNode(config['test_node_title'], config['computer_id'])
test_suite_json = self.test_suite_portal.startTestSuite(config['test_node_title'])
- test_suite_data = testnodeUtils.deunicodeData(json.loads(test_suite_json))
+ test_suite_data = Utils.deunicodeData(json.loads(test_suite_json))
log("Got following test suite data from master : %r" % \
(test_suite_data,))
# TODO : implement this method for each distributor
--
2.30.9