Title: [opsview] [11831] Fixed tests due to addition of plugin.d directory in opspack
- Revision
- 11831
- Author
- tvoon
- Date
- 2013-03-18 09:41:47 +0000 (Mon, 18 Mar 2013)
Log Message
Fixed tests due to addition of plugin.d directory in opspack
Modified Paths
Modified: trunk/opsview-core/bin/create_opspack
===================================================================
--- trunk/opsview-core/bin/create_opspack 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-core/bin/create_opspack 2013-03-18 09:41:47 UTC (rev 11831)
@@ -492,6 +492,7 @@
mpack: clean
mkdir ${PACKNAME}
cp info config.json ${PACKNAME}
+ # plugin.d is only created if required - can ignore warnings about directory missing
tar --exclude=.svn -cf - plugins plugin.d | tar -C ${PACKNAME} -xf -
tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-core/t/var/opsview.test.db 2013-03-18 09:41:47 UTC (rev 11831)
@@ -1630,7 +1630,7 @@
INSERT INTO `plugins` VALUES ('check_disk_smb',1,'check_disk_smb: testdb','');
INSERT INTO `plugins` VALUES ('check_dns',1,'check_dns: testdb','');
INSERT INTO `plugins` VALUES ('check_dummy',1,'check_dummy: testdb','');
-INSERT INTO `plugins` VALUES ('check_dummy_plugin',1,NULL,'');
+INSERT INTO `plugins` VALUES ('check_dummy_plugin',1,'Help text!\n','');
INSERT INTO `plugins` VALUES ('check_file_age',1,'check_file_age: testdb','');
INSERT INTO `plugins` VALUES ('check_flexlm',1,'check_flexlm: testdb','');
INSERT INTO `plugins` VALUES ('check_ftp',1,'check_ftp: testdb','');
Modified: trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/Makefile
===================================================================
--- trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/Makefile 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/Makefile 2013-03-18 09:41:47 UTC (rev 11831)
@@ -5,7 +5,8 @@
mpack: clean
mkdir ${PACKNAME}
cp info config.json ${PACKNAME}
- tar --exclude=.svn -cf - plugins | tar -C ${PACKNAME} -xf -
+ # plugin.d is only created if required - can ignore warnings about directory missing
+ tar --exclude=.svn -cf - plugins plugin.d | tar -C ${PACKNAME} -xf -
tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
clean:
Modified: trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/info
===================================================================
--- trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/info 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-web/t/var/monitorpack.expected/monitorpack-creation/info 2013-03-18 09:41:47 UTC (rev 11831)
@@ -1,4 +1,4 @@
-NAME=com.example.monitorpack.monitorpack_creation
+NAME=com.example.opspack.monitorpack_creation
VERSION=1.0
ALIAS=Monitorpack creation
DEPENDENCIES=
Modified: trunk/opsview-web/t/var/monitorpack.expected/network-base/Makefile
===================================================================
--- trunk/opsview-web/t/var/monitorpack.expected/network-base/Makefile 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-web/t/var/monitorpack.expected/network-base/Makefile 2013-03-18 09:41:47 UTC (rev 11831)
@@ -5,7 +5,8 @@
mpack: clean
mkdir ${PACKNAME}
cp info config.json ${PACKNAME}
- tar --exclude=.svn -cf - plugins | tar -C ${PACKNAME} -xf -
+ # plugin.d is only created if required - can ignore warnings about directory missing
+ tar --exclude=.svn -cf - plugins plugin.d | tar -C ${PACKNAME} -xf -
tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
clean:
Modified: trunk/opsview-web/t/var/monitorpack.expected/network-base/info
===================================================================
--- trunk/opsview-web/t/var/monitorpack.expected/network-base/info 2013-03-18 09:22:23 UTC (rev 11830)
+++ trunk/opsview-web/t/var/monitorpack.expected/network-base/info 2013-03-18 09:41:47 UTC (rev 11831)
@@ -1,4 +1,4 @@
-NAME=com.example.monitorpack.network_base
+NAME=com.example.opspack.network_base
VERSION=1.0
ALIAS=Network - Base
DEPENDENCIES=
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
