From 1c91e7852529eda5aa25217f727edf58fe9eb9dd Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Sun, 01 Jun 2008 14:26:09 +0000
Subject: [PATCH] Enable snmp/snmp_mibvalues testsuite
---
opendj-sdk/opends/tests/shared/python/snmp.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/tests/shared/python/snmp.py b/opendj-sdk/opends/tests/shared/python/snmp.py
index a6fa1ea..312135a 100644
--- a/opendj-sdk/opends/tests/shared/python/snmp.py
+++ b/opendj-sdk/opends/tests/shared/python/snmp.py
@@ -50,7 +50,7 @@
return table
-def compare_snmp_values(refTable, newTable):
+def compare_snmp_values(refTable, newTable, index):
import re
result = ''
@@ -67,18 +67,18 @@
result = result + 'ERROR: Entry ' + refKey + ' does not exists'
result = result + ' in the new table.\n'
else:
- result = result + refKey + '=> expected: ' + refTable[refKey]
+ result = result + refKey + '=> expected: ' + refTable[refKey]
result = result + ' , result: ' + newTable[refKey] + '\n'
- pattern1 = re.compile('dsApplIfOutBytes.*')
- pattern2 = re.compile('dsApplIfInBytes.*')
- if pattern1.search(refKey) != None or pattern2.search(refKey) != None:
- if refTable[refKey] > newTable[refKey]:
- result = result + 'ERROR: Value for ' + refKey
+ pattern1 = 'dsApplIfOutBytes.%s' % index
+ pattern2 = 'dsApplIfInBytes.%s' % index
+ if refKey == pattern1 or refKey == pattern2:
+ if int(newTable[refKey]) <= int(refTable[refKey]):
+ result = result + 'ERROR: Value for ' + refKey
result = result + ' should be greater.\n'
else:
if refTable[refKey] != newTable[refKey]:
- result = result + 'ERROR: Value for ' + refKey
+ result = result + 'ERROR: Value for ' + refKey
result = result + ' should be the same.\n'
return result
--
Gitblit v1.10.0