From da40de5b860952ec063b246545632642d00ba0bf Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Fri, 16 Sep 2011 16:28:35 +0000
Subject: [PATCH] Clean of use of data and temp data in functional tests
---
opends/tests/staf-tests/shared/python/replication.py | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/opends/tests/staf-tests/shared/python/replication.py b/opends/tests/staf-tests/shared/python/replication.py
index 2117455..d292014 100644
--- a/opends/tests/staf-tests/shared/python/replication.py
+++ b/opends/tests/staf-tests/shared/python/replication.py
@@ -24,6 +24,7 @@
#
#
# Copyright 2008 Sun Microsystems, Inc.
+# Portions Copyright 2011 ForgeRock AS.
@@ -76,9 +77,14 @@
# Define Server class
class Server:
- def __init__(self, hostname, dir, port, adminPort, sslPort, jmxPort, rootDn, rootPwd, baseDn):
+ def __init__(self, hostname, dir, port, adminPort, sslPort, jmxPort, rootDn, rootPwd, baseDn, datadir):
self.hostname = hostname
self.dir = dir
+ self.temp = '%s/temp' % dir
+ if self.hostIsLocal(self.hostname):
+ self.data = datadir
+ else:
+ self.data = '%s/testdata/data' % self.dir
self.port = port
self.adminPort = adminPort
self.sslPort = sslPort
@@ -100,9 +106,15 @@
def getHostname(self):
return self.hostname
-
+
def getDir(self):
return self.dir
+
+ def getTmpDir(self):
+ return self.temp
+
+ def getDataDir(self):
+ return self.data
def getPort(self):
return self.port
@@ -159,7 +171,12 @@
return replServer
-
+ def hostIsLocal(self,hostname):
+ from socket import gethostbyname
+ if gethostbyname(hostname).startswith('127.0'):
+ return 1
+ else:
+ return 0
--
Gitblit v1.10.0