Menu
▾
▴
[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-449-g85e3af9
|
From: Michael Chase-S. <mc...@us...> - 2013-06-04 23:43:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 85e3af961d5633595659377fb5847e1266fbac2a (commit)
via cd904dec209fb7462c6fbf0f9143c0854702583c (commit)
from 10ae1a730dd4e58ec36f3fbc38203692aa64e8d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 85e3af961d5633595659377fb5847e1266fbac2a
Merge: cd904de 10ae1a7
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Jun 4 19:42:57 2013 -0400
Merge branch 'master' of ssh://git.code.sf.net/p/sblim/sfcb
commit cd904dec209fb7462c6fbf0f9143c0854702583c
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Jun 4 19:41:09 2013 -0400
[sfcb-tix:#18] disable default properties breaks test
Modified failing tests, also made test case insensitive
and fixed result file naming
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
.../tests/Test1EnumerateInstances.lines | 28 ----------
test/TestProviders/tests/Test7ExecQuery.lines | 3 -
test/TestProviders/tests/Test7ExecQuery1.lines | 8 ---
test/TestProviders/tests/Test7ExecQuery2.lines | 6 --
test/TestProviders/tests/Test7ExecQuery3.lines | 10 ----
test/TestProviders/tests/Test7ExecQuery4.lines | 6 --
test/TestProviders/tests/Test7ExecQuery5.lines | 8 ---
test/TestProviders/tests/TestMisc8.lines | 1 -
test/TestProviders/tests/xmltest.sh | 6 +-
test/xmltest/CHS_AI_IS.lines | 3 +-
test/xmltest/ECTP_AI_IS.lines | 2 +-
test/xmltest/EnumerateClasses1.lines | 4 --
...{InstanceTest2Get.OK => InstanceTest2Get.lines} | 3 -
test/xmltest/LD_modify01-create.lines | 3 +-
test/xmltest/Makefile.am | 6 ++
test/xmltest/SAE_03_AI_IF.lines | 42 ---------------
.../enumerateInstance_CIM_IndicationService.lines | 54 --------------------
test/xmltest/execQuery10.prereq | 8 +++
test/xmltest/execQuery7.prereq | 8 +++
test/xmltest/execQuery_ServerProv.lines | 33 ------------
test/xmltest/getInstance_NameSpace.lines | 20 -------
test/xmltest/xmltest.sh | 6 +-
23 files changed, 33 insertions(+), 236 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9953c41..056d5c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,6 +583,7 @@ AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
AM_CONDITIONAL(ACCOUNT_PASSTHRU,[test "$enable_expired_pw_update" == "yes"])
+AM_CONDITIONAL(DEFAULT_PROPERTIES,[test "$enable_default_properties" == "yes"])
AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh
sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 20_indication.mof.pre
diff --git a/test/TestProviders/tests/Test1EnumerateInstances.lines b/test/TestProviders/tests/Test1EnumerateInstances.lines
index ef23387..dff9648 100644
--- a/test/TestProviders/tests/Test1EnumerateInstances.lines
+++ b/test/TestProviders/tests/Test1EnumerateInstances.lines
@@ -3,38 +3,10 @@
<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Identifier" TYPE="uint8">
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-<VALUE><INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>I&apos;m an EmbeddedInstance</VALUE>
-</PROPERTY>
-</INSTANCE>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-<VALUE><INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>1</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Message" TYPE="string">
-<VALUE>I&apos;m an EmbeddedObject</VALUE>
-</PROPERTY>
-</INSTANCE>
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hello World</VALUE>
<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
<VALUE>2</VALUE>
-<PROPERTY NAME="Einst" EmbeddedObject="instance" TYPE="string">
-<PROPERTY NAME="Eobj" EmbeddedObject="object" TYPE="string">
<VALUE>Yo Planet</VALUE>
<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
<VALUE>3</VALUE>
diff --git a/test/TestProviders/tests/Test7ExecQuery.lines b/test/TestProviders/tests/Test7ExecQuery.lines
index 6bc79f1..1df48bf 100644
--- a/test/TestProviders/tests/Test7ExecQuery.lines
+++ b/test/TestProviders/tests/Test7ExecQuery.lines
@@ -5,9 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
-</PROPERTY>
</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery1.lines b/test/TestProviders/tests/Test7ExecQuery1.lines
index 1cac895..a82b71a 100644
--- a/test/TestProviders/tests/Test7ExecQuery1.lines
+++ b/test/TestProviders/tests/Test7ExecQuery1.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -18,9 +16,3 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-<VALUE>2</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery2.lines b/test/TestProviders/tests/Test7ExecQuery2.lines
index ffc8423..f76e282 100644
--- a/test/TestProviders/tests/Test7ExecQuery2.lines
+++ b/test/TestProviders/tests/Test7ExecQuery2.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -18,8 +16,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>2</VALUE>
</PROPERTY>
@@ -31,8 +27,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>3</VALUE>
</PROPERTY>
diff --git a/test/TestProviders/tests/Test7ExecQuery3.lines b/test/TestProviders/tests/Test7ExecQuery3.lines
index 71c6334..86eea77 100644
--- a/test/TestProviders/tests/Test7ExecQuery3.lines
+++ b/test/TestProviders/tests/Test7ExecQuery3.lines
@@ -2,20 +2,10 @@
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hello World</VALUE>
</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
</INSTANCE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Hey Earth</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery4.lines b/test/TestProviders/tests/Test7ExecQuery4.lines
index e34d3b8..7223982 100644
--- a/test/TestProviders/tests/Test7ExecQuery4.lines
+++ b/test/TestProviders/tests/Test7ExecQuery4.lines
@@ -1,7 +1,5 @@
<VALUE>Hello World</VALUE>
</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
</INSTANCE>
</VALUE.OBJECTWITHPATH>
<VALUE.OBJECTWITHPATH>
@@ -9,7 +7,3 @@
<INSTANCE CLASSNAME="Sample_Instance">
<PROPERTY NAME="Message" TYPE="string">
<VALUE>Yo Planet</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Identifier" TYPE="uint8">
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/Test7ExecQuery5.lines b/test/TestProviders/tests/Test7ExecQuery5.lines
index eb83b63..3dd5d67 100644
--- a/test/TestProviders/tests/Test7ExecQuery5.lines
+++ b/test/TestProviders/tests/Test7ExecQuery5.lines
@@ -5,8 +5,6 @@
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>1</VALUE>
</PROPERTY>
@@ -15,12 +13,6 @@
<KEYBINDING NAME="Identifier">
<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="Sample_Instance">
-<PROPERTY NAME="Message" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="Identifier" TYPE="uint8">
<VALUE>3</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/TestProviders/tests/TestMisc8.lines b/test/TestProviders/tests/TestMisc8.lines
index 76bb0b0..6ab145c 100644
--- a/test/TestProviders/tests/TestMisc8.lines
+++ b/test/TestProviders/tests/TestMisc8.lines
@@ -1,6 +1,5 @@
<METHODRESPONSE NAME="TestCMPIBroker">
<RETURNVALUE PARAMTYPE="uint32">
-<VALUE>0</VALUE>
</RETURNVALUE>
<PARAMVALUE NAME="Result" PARAMTYPE="string">
<VALUE>_testCMPIInstance </VALUE>
diff --git a/test/TestProviders/tests/xmltest.sh b/test/TestProviders/tests/xmltest.sh
index 3037e58..8ade2ed 100755
--- a/test/TestProviders/tests/xmltest.sh
+++ b/test/TestProviders/tests/xmltest.sh
@@ -42,7 +42,7 @@ do
_TEST=${xmlfile%.xml}
_TESTOK=$_TEST.OK
_TESTLINES=$_TEST.lines
- _TESTRESULT=$(basename _TEST).result
+ _TESTRESULT=$_TEST.result
_TESTPREREQ=$_TEST.prereq
_TESTNAME=$_TEST
@@ -97,7 +97,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep -F --q "$text" $_TESTRESULT ; then
+ if grep -Fi --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED disallowed line found"
@@ -110,7 +110,7 @@ do
fi
else
# Check for required lines
- if ! grep -F --q "$line" $_TESTRESULT ; then
+ if ! grep -Fi --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo "FAILED required line not found"
diff --git a/test/xmltest/CHS_AI_IS.lines b/test/xmltest/CHS_AI_IS.lines
index 7dba4f5..221f0b5 100644
--- a/test/xmltest/CHS_AI_IS.lines
+++ b/test/xmltest/CHS_AI_IS.lines
@@ -1,5 +1,4 @@
<IMETHODRESPONSE NAME="Associators">
<KEYVALUE VALUETYPE="string">CIM_System</KEYVALUE>
<INSTANCE CLASSNAME="CIM_System">
-<PROPERTY NAME="PrimaryOwnerContact" TYPE="string">
-
+<PROPERTY.ARRAY NAME="AdvertiseTypes" TYPE="uint16">
diff --git a/test/xmltest/ECTP_AI_IS.lines b/test/xmltest/ECTP_AI_IS.lines
index 5bec0ee..afc9796 100644
--- a/test/xmltest/ECTP_AI_IS.lines
+++ b/test/xmltest/ECTP_AI_IS.lines
@@ -1,5 +1,5 @@
<IMETHODRESPONSE NAME="Associators">
<INSTANCENAME CLASSNAME="CIM_System">
-<PROPERTY.ARRAY NAME="IdentifyingDescriptions" TYPE="string">
+<PROPERTY.ARRAY NAME="AdvertiseTypes" TYPE="uint16">
<INSTANCE CLASSNAME="SFCB_RegisteredProfile">
<PROPERTY NAME="RegisteredVersion" TYPE="string">
diff --git a/test/xmltest/EnumerateClasses1.lines b/test/xmltest/EnumerateClasses1.lines
index f3c2ca5..2d4739d 100644
--- a/test/xmltest/EnumerateClasses1.lines
+++ b/test/xmltest/EnumerateClasses1.lines
@@ -17,8 +17,4 @@
<QUALIFIER NAME="Description" TYPE="string">
<VALUE>The following class describes LogicalVolume as depicted on PDM'sMr_LogicalVolume</VALUE>
</QUALIFIER>
-<PROPERTY NAME="key" TYPE="sint32">
-<QUALIFIER NAME="Key" TYPE="boolean">
-<VALUE>TRUE</VALUE>
-</QUALIFIER>
</PROPERTY>
diff --git a/test/xmltest/InstanceTest2Get.OK b/test/xmltest/InstanceTest2Get.lines
similarity index 81%
rename from test/xmltest/InstanceTest2Get.OK
rename to test/xmltest/InstanceTest2Get.lines
index 56ad526..62a10cf 100644
--- a/test/xmltest/InstanceTest2Get.OK
+++ b/test/xmltest/InstanceTest2Get.lines
@@ -5,9 +5,6 @@
<IMETHODRESPONSE NAME="GetInstance">
<IRETURNVALUE>
<INSTANCE CLASSNAME="TEST_Person">
-<PROPERTY NAME="extraProperty" TYPE="string">
-<VALUE>defaultvalue</VALUE>
-</PROPERTY>
<PROPERTY NAME="name" TYPE="string">
<VALUE>Michael</VALUE>
</PROPERTY>
diff --git a/test/xmltest/LD_modify01-create.lines b/test/xmltest/LD_modify01-create.lines
index 4c216ca..95ae5e5 100644
--- a/test/xmltest/LD_modify01-create.lines
+++ b/test/xmltest/LD_modify01-create.lines
@@ -1,3 +1,4 @@
-<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ListenerDestinationCIMXML</KEYVALUE>
</KEYBINDING>
+<IMETHODRESPONSE NAME="CreateInstance">
+<INSTANCENAME CLASSNAME="CIM_ListenerDestinationCIMXML">
diff --git a/test/xmltest/Makefile.am b/test/xmltest/Makefile.am
index b30cd14..2c01f4f 100644
--- a/test/xmltest/Makefile.am
+++ b/test/xmltest/Makefile.am
@@ -30,6 +30,12 @@ else
export SFCB_TEST_PROTOCOL=http
endif
+if DEFAULT_PROPERTIES
+ export DEFAULT_PROPERTIES=yes
+else
+ export DEFAULT_PROPERTIES=no
+endif
+
#Some wbemcat tests
export SRCDIR=$(srcdir)
TESTS = xmltest.sh
diff --git a/test/xmltest/SAE_03_AI_IF.lines b/test/xmltest/SAE_03_AI_IF.lines
index 6737609..8573f37 100644
--- a/test/xmltest/SAE_03_AI_IF.lines
+++ b/test/xmltest/SAE_03_AI_IF.lines
@@ -8,73 +8,31 @@
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
</INSTANCE>
<INSTANCENAME CLASSNAME="CIM_IndicationService">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationService</KEYVALUE>
-</KEYBINDING>
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
-</KEYBINDING>
-</INSTANCENAME>
-</INSTANCEPATH>
<INSTANCE CLASSNAME="CIM_IndicationService">
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_IndicationService</VALUE>
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/enumerateInstance_CIM_IndicationService.lines b/test/xmltest/enumerateInstance_CIM_IndicationService.lines
index 2968153..9fdeea2 100644
--- a/test/xmltest/enumerateInstance_CIM_IndicationService.lines
+++ b/test/xmltest/enumerateInstance_CIM_IndicationService.lines
@@ -7,72 +7,18 @@
<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
</PROPERTY>
<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="ElementName" TYPE="string">
<VALUE>sfcb</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
</INSTANCE>
<INSTANCENAME CLASSNAME="CIM_IndicationService">
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationService</KEYVALUE>
-</KEYBINDING>
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
-</KEYBINDING>
</INSTANCENAME>
-<INSTANCE CLASSNAME="CIM_IndicationService">
-<PROPERTY NAME="SubscriptionRemovalTimeInterval" TYPE="uint32">
-</PROPERTY>
-<PROPERTY NAME="SubscriptionRemovalAction" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="DeliveryRetryInterval" TYPE="uint32">
-</PROPERTY>
-<PROPERTY NAME="DeliveryRetryAttempts" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
-<VALUE>TRUE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TransitioningToState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledDefault" TYPE="uint16">
-<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="RequestedState" TYPE="uint16">
-<VALUE>12</VALUE>
-</PROPERTY>
-<PROPERTY NAME="EnabledState" TYPE="uint16">
-<VALUE>5</VALUE>
-</PROPERTY>
-<PROPERTY NAME="ElementName" TYPE="string">
-<VALUE>sfcb</VALUE>
-</PROPERTY>
-<PROPERTY NAME="SystemCreationClassName" TYPE="string">
-<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="CreationClassName" TYPE="string">
-<VALUE>CIM_IndicationService</VALUE>
-</PROPERTY>
-</INSTANCE>
diff --git a/test/xmltest/execQuery10.prereq b/test/xmltest/execQuery10.prereq
new file mode 100755
index 0000000..678e3ff
--- /dev/null
+++ b/test/xmltest/execQuery10.prereq
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This query won't work with default properties disabled.
+if [ "$DEFAULT_PROPERTIES" != "yes" ]
+then
+ exit 1
+else
+ exit 0
+fi
diff --git a/test/xmltest/execQuery7.prereq b/test/xmltest/execQuery7.prereq
new file mode 100755
index 0000000..678e3ff
--- /dev/null
+++ b/test/xmltest/execQuery7.prereq
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This query won't work with default properties disabled.
+if [ "$DEFAULT_PROPERTIES" != "yes" ]
+then
+ exit 1
+else
+ exit 0
+fi
diff --git a/test/xmltest/execQuery_ServerProv.lines b/test/xmltest/execQuery_ServerProv.lines
index ae1be16..57db6fd 100644
--- a/test/xmltest/execQuery_ServerProv.lines
+++ b/test/xmltest/execQuery_ServerProv.lines
@@ -4,7 +4,6 @@
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ObjectManager</KEYVALUE>
-</KEYBINDING>
</INSTANCENAME>
</INSTANCEPATH>
<INSTANCE CLASSNAME="CIM_ObjectManager">
@@ -13,46 +12,14 @@
</PROPERTY>
<PROPERTY NAME="GatherStatisticalData" TYPE="boolean">
<VALUE>FALSE</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Started" TYPE="boolean">
-</PROPERTY>
-<PROPERTY NAME="StartMode" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="PrimaryOwnerContact" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="PrimaryOwnerName" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_ObjectManager</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="Caption" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="InstanceID" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="InstallDate" TYPE="datetime">
-</PROPERTY>
-<PROPERTY.ARRAY NAME="OperationalStatus" TYPE="uint16">
-</PROPERTY.ARRAY>
-<PROPERTY.ARRAY NAME="StatusDescriptions" TYPE="string">
-</PROPERTY.ARRAY>
-<PROPERTY NAME="Status" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="HealthState" TYPE="uint16">
-</PROPERTY>
<PROPERTY NAME="EnabledState" TYPE="uint16">
<VALUE>5</VALUE>
-</PROPERTY>
-<PROPERTY NAME="OtherEnabledState" TYPE="string">
-</PROPERTY>
<PROPERTY NAME="RequestedState" TYPE="uint16">
<VALUE>5</VALUE>
-</PROPERTY>
<PROPERTY NAME="EnabledDefault" TYPE="uint16">
<VALUE>2</VALUE>
-</PROPERTY>
-<PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime">
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/getInstance_NameSpace.lines b/test/xmltest/getInstance_NameSpace.lines
index 07f888c..fce936a 100644
--- a/test/xmltest/getInstance_NameSpace.lines
+++ b/test/xmltest/getInstance_NameSpace.lines
@@ -1,33 +1,13 @@
<INSTANCE CLASSNAME="CIM_Namespace">
-<PROPERTY NAME="DescriptionOfClassType" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ClassTypeVersion" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ClassType" TYPE="uint16">
-</PROPERTY>
-<PROPERTY NAME="DescriptionOfClassInfo" TYPE="string">
</PROPERTY>
<PROPERTY NAME="ClassInfo" TYPE="uint16">
<VALUE>0</VALUE>
-</PROPERTY>
<PROPERTY NAME="Name" TYPE="string">
<VALUE>root/interop</VALUE>
-</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_Namespace</VALUE>
-</PROPERTY>
<PROPERTY NAME="ObjectManagerCreationClassName" TYPE="string">
<VALUE>CIM_ObjectManager</VALUE>
-</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
-</PROPERTY>
-<PROPERTY NAME="InstanceID" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Caption" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="Description" TYPE="string">
-</PROPERTY>
-<PROPERTY NAME="ElementName" TYPE="string">
-</PROPERTY>
</INSTANCE>
diff --git a/test/xmltest/xmltest.sh b/test/xmltest/xmltest.sh
index a6051ad..db33232 100755
--- a/test/xmltest/xmltest.sh
+++ b/test/xmltest/xmltest.sh
@@ -42,7 +42,7 @@ do
_TEST=${xmlfile%.xml}
_TESTOK=$_TEST.OK
_TESTLINES=$_TEST.lines
- _TESTRESULT=$(basename _TEST).result
+ _TESTRESULT=$_TEST.result
_TESTPREREQ=$_TEST.prereq
_TESTNAME=$_TEST
@@ -100,7 +100,7 @@ do
notline=$(echo $line | awk '{ line=index($line,"!"); print line; }' )
if [ "$notline" != 0 ] ; then
text=$(echo $line | awk '{ line=substr($line, 2); print line; }' )
- if grep -F --q "$text" $_TESTRESULT ; then
+ if grep -Fi --q "$text" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
echo -n "FAILED disallowed line found"
passed=1
@@ -111,7 +111,7 @@ do
fi
else
# Check for required lines
- if ! grep -F --q "$line" $_TESTRESULT ; then
+ if ! grep -Fi --q "$line" $_TESTRESULT ; then
if [ $passed -eq 0 ] ; then
printf $red
echo -n "FAILED required line not found"
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
