From 919ceb8ad59ae59270728f2e5aacee997725b9b6 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 11 Feb 2013 17:01:13 +0000
Subject: [PATCH] CR-1273 Fix for snmp basic testsuite
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml | 49 ++++++++++++++++++++++++++++++++++---------------
opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml | 9 ++++++++-
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
index 313637b..24b88c3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
@@ -24,7 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008 Sun Microsystems, Inc.
- ! Portions Copyright 2012 ForgeRock AS
+ ! Portions Copyright 2012-2013 ForgeRock AS
! -->
<stax>
@@ -88,7 +88,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue none
+ #@TestIssue OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -115,7 +115,8 @@
'snmpCommunity' : community ,
'snmpOIDs' : '' ,
'snmpStatus' : 'noError' ,
- 'snmpWalk' : 'True'
+ 'snmpWalk' : 'True' ,
+ 'knownIssue' : 'OPENDJ-750'
}
</call>
@@ -372,7 +373,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -434,7 +435,10 @@
str(int(DEFAULT_VALUES[key]) + nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfSearchOps entry' }
</call>
@@ -492,7 +496,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -564,7 +568,10 @@
DEFAULT_VALUES['dsMasterEntries.1'] = \
str(int(DEFAULT_VALUES['dsMasterEntries.1']) + nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfAddEntryOps entry' }
</call>
@@ -622,7 +629,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -683,7 +690,10 @@
DEFAULT_VALUES['dsMasterEntries.1'] = \
str(int(DEFAULT_VALUES['dsMasterEntries.1']) - nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfRemoveEntryOps entry' }
</call>
@@ -741,7 +751,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -801,7 +811,10 @@
DEFAULT_VALUES[key] = \
str(int(DEFAULT_VALUES[key]) + nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfCompareOps entry' }
</call>
@@ -859,7 +872,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -921,7 +934,10 @@
DEFAULT_VALUES[key] = \
str(int(DEFAULT_VALUES[key]) + nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfModifyEntryOps entry' }
</call>
@@ -979,7 +995,7 @@
<!--- Test Case information
#@TestMarker SNMP MIB values
#@TestName snmp_mibvalues: TODO
- #@TestIssue 3862
+ #@TestIssue 3862 OPENDJ-750
#@TestPurpose TODO.
#@TestPreamble none
#@TestStep TODO.
@@ -1089,7 +1105,10 @@
DEFAULT_VALUES[key] = \
str(int(DEFAULT_VALUES[key]) + nbLoop)
</script>
-
+ <call function="'setKnownIssue'">
+ { 'issueId' : 'OPENDJ-750' }
+ </call>
+
<call function="'testStep'">
{ 'stepMessage' : 'Check value of dsApplIfModifyRDNOps entry' }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
index c51915e..951cb85 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2013 ForgeRock AS
! -->
<stax>
<!-- SNMP Get -->
@@ -115,6 +116,11 @@
</function-arg-description>
<function-arg-property name="type" value="integer"/>
</function-arg-def>
+ <function-arg-def name="knownIssue" type="optional" default="None">
+ <function-arg-description>
+ Known issue. Corresponds to an issue number.
+ </function-arg-description>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -211,7 +217,8 @@
'location' : location ,
'path' : '%s/snmp' % remote.java ,
'envCmd' : env ,
- 'expectedRC' : expectedRC
+ 'expectedRC' : expectedRC ,
+ 'knownIssue' : knownIssue
}
</call>
--
Gitblit v1.10.0