From 119285a0acdfd319815072a9c247a58507e3d21c Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Mon, 18 Aug 2008 14:31:35 +0000
Subject: [PATCH] Avoid extra-verbose logs by not sistematically displaying ldapsearch result
---
opends/tests/shared/functions/tools.xml | 28 ++++++---
opends/tests/functional-tests/testcases/replication/conflict/conflict.xml | 105 +++++++++++++++++++++++-----------
2 files changed, 88 insertions(+), 45 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml b/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
index a9dcbe2..1ff94ed 100644
--- a/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -194,7 +194,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -321,7 +322,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -358,7 +360,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -479,7 +482,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -516,7 +520,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -664,7 +669,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -701,7 +707,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -853,7 +860,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -890,7 +898,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1017,7 +1026,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1054,7 +1064,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1185,7 +1196,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1222,7 +1234,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1356,7 +1369,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1393,7 +1407,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1526,7 +1541,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1563,7 +1579,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'employeeNumber'
+ 'dsAttributes' : 'employeeNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1721,7 +1738,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description telephoneNumber'
+ 'dsAttributes' : 'description telephoneNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1758,7 +1776,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description telephoneNumber'
+ 'dsAttributes' : 'description telephoneNumber',
+ 'logStderr' : False
}
</call>
<script>
@@ -1891,7 +1910,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -1928,7 +1948,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2061,7 +2082,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2098,7 +2120,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2235,7 +2258,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2272,7 +2296,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2408,7 +2433,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2445,7 +2471,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : entry.getDn(),
'dsFilter' : 'objectclass=*',
- 'dsAttributes' : 'description'
+ 'dsAttributes' : 'description',
+ 'logStderr' : False
}
</call>
<script>
@@ -2578,7 +2605,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : synchroSuffix,
'dsFilter' : 'givenname=DUMMY ENTRY',
- 'dsAttributes' : 'ds-sync-conflict cn'
+ 'dsAttributes' : 'ds-sync-conflict cn',
+ 'logStderr' : False
}
</call>
<script>
@@ -2605,7 +2633,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : 'cn=monitor',
'dsFilter' : monitorFilter,
- 'dsAttributes' : monitorCounters
+ 'dsAttributes' : monitorCounters,
+ 'logStderr' : False
}
</call>
<script>
@@ -2644,7 +2673,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : synchroSuffix,
'dsFilter' : 'givenname=DUMMY ENTRY',
- 'dsAttributes' : 'ds-sync-conflict cn'
+ 'dsAttributes' : 'ds-sync-conflict cn',
+ 'logStderr' : False
}
</call>
<script>
@@ -2684,7 +2714,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : 'cn=monitor',
'dsFilter' : monitorFilter,
- 'dsAttributes' : monitorCounters
+ 'dsAttributes' : monitorCounters,
+ 'logStderr' : False
}
</call>
<script>
@@ -2837,7 +2868,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : synchroSuffix,
'dsFilter' : 'givenname=DUMMY ENTRY',
- 'dsAttributes' : 'ds-sync-conflict cn'
+ 'dsAttributes' : 'ds-sync-conflict cn',
+ 'logStderr' : False
}
</call>
<script>
@@ -2864,7 +2896,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : 'cn=monitor',
'dsFilter' : monitorFilter,
- 'dsAttributes' : monitorCounters
+ 'dsAttributes' : monitorCounters,
+ 'logStderr' : False
}
</call>
<script>
@@ -2903,7 +2936,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : synchroSuffix,
'dsFilter' : 'givenname=DUMMY ENTRY',
- 'dsAttributes' : 'ds-sync-conflict cn'
+ 'dsAttributes' : 'ds-sync-conflict cn',
+ 'logStderr' : False
}
</call>
<script>
@@ -2943,7 +2977,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : 'cn=monitor',
'dsFilter' : monitorFilter,
- 'dsAttributes' : monitorCounters
+ 'dsAttributes' : monitorCounters,
+ 'logStderr' : False
}
</call>
<script>
diff --git a/opends/tests/shared/functions/tools.xml b/opends/tests/shared/functions/tools.xml
index 9aa0b96..e1ab9c9 100755
--- a/opends/tests/shared/functions/tools.xml
+++ b/opends/tests/shared/functions/tools.xml
@@ -474,7 +474,8 @@
<function name="verifyTrees">
<function-prolog>
- This function verifies that the trees in a group of ldap servers are synchronized.
+ This function verifies that the trees in a group of ldap servers are
+ synchronized.
</function-prolog>
<function-list-args>
<function-arg-def name="location"
@@ -520,13 +521,14 @@
myRC = 0
failedServers = []
failingServerList = ''
- referenceServerPath = '%s/%s' % (referenceServer.getDir(), OPENDSNAME)
+ referenceServerPath = '%s/%s' % (referenceServer.getDir(), OPENDSNAME)
referenceTree = 'referenceTree.ldif'
sampleTree = 'sampleTree.ldif'
treeDiffs = 'treeDiffs.ldif'
</script>
<message>
- 'Verify tree %s taking %s as reference.' % (treeSuffix, referenceServerPath)
+ 'Verify tree %s taking %s as reference.' \
+ % (treeSuffix, referenceServerPath)
</message>
<!-- Retrieve the tree from the reference server -->
<call function="'ldapSearchWithScript'">
@@ -557,7 +559,8 @@
'dsInstancePswd' : server.getRootPwd(),
'dsBaseDN' : treeSuffix,
'dsFilter' : 'objectclass=*',
- 'outputFile' : sampleTree
+ 'outputFile' : sampleTree,
+ 'logStderr' : False
}
</call>
<if expr="RC == 0">
@@ -565,7 +568,7 @@
<!-- Compare this tree to the reference one -->
<call function="'LdifDiffWithScript'">
{ 'location' : location,
- 'dsPath' : dsPath,
+ 'dsPath' : dsPath,
'sourceLdif' : '%s/../%s' % (dsPath, sampleTree),
'targetLdif' : '%s/../%s' % (dsPath, referenceTree),
'outputLdif' : '%s/../%s' % (dsPath, treeDiffs)
@@ -573,24 +576,29 @@
</call>
<script>
if STAXResult != 0 :
- failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
+ failedServers.append('%s:%s' % \
+ (server.getHostname(), server.getPort()))
</script>
</sequence>
<else>
<script>
- failedServers.append('%s:%s' % (server.getHostname(), server.getPort()))
+ failedServers.append('%s:%s' % \
+ (server.getHostname(), server.getPort()))
</script>
</else>
</if>
</sequence>
</iterate>
<if expr="len(failedServers) > 0">
- <!-- If at least one server failed to successfully compare to the reference tree,
- ! return an error, along with the list of the servers that failed to do so -->
+ <!-- If at least one server failed to successfully compare to the
+ ! reference tree, return an error, along with the list of the
+ ! servers that failed to do so -->
<script>
myRC = 1
comma = ','
- failingServerList = 'List of non-synchronized servers (tree verify FAILED): %s ' % comma.join(failedServers)
+ failingServerList = \
+ 'List of non-synchronized servers (tree verify FAILED): %s ' \
+ % comma.join(failedServers)
</script>
<else>
<message>
--
Gitblit v1.10.0