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/common.py | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/opends/tests/staf-tests/shared/python/common.py b/opends/tests/staf-tests/shared/python/common.py
index b3b3f41..4ac4b0e 100644
--- a/opends/tests/staf-tests/shared/python/common.py
+++ b/opends/tests/staf-tests/shared/python/common.py
@@ -53,7 +53,8 @@
"group_to_run" ,
"get_last_attr_from_entry" ,
"list_matches" ,
- "count_attr" ]
+ "count_attr" ,
+ "host_is_localhost"]
class format_testcase:
'Format the Test name objects'
@@ -531,7 +532,7 @@
'Container to hold local and remote test data instance objects'
def __init__(self,dir):
self.directory=dir
- self.testdata='%s/testdata' % dir
+ self.testdata='%s/testdata' % dir
self.java='%s/java' % self.testdata
self.data='%s/data' % self.testdata
self.temp='%s/temp' % dir
@@ -559,6 +560,9 @@
def get_reljavadir(self):
return self.directory
+ def set_data(self,dir):
+ self.data=dir
+
def get_test_name(name):
i=2
__name=''
@@ -796,3 +800,18 @@
return attrnum
+def host_is_localhost(hostname):
+ from socket import gethostbyname
+ if gethostbyname(hostname).startswith('127.0'):
+ return 1
+ else:
+ return 0
+
+def hosts_are_same(hostname1,hostname2):
+ from socket import gethostbyname
+ if hostname1 == hostname2:
+ return 1
+ else:
+ return 0
+
+
--
Gitblit v1.10.0