fence-agents: master - testing: python agents are tested for working delay function

Marek GrĂ¡c marx at fedoraproject.org
Mon May 5 10:29:46 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=745a14e0df001a41835ca8def53a9580154d158d
Commit:        745a14e0df001a41835ca8def53a9580154d158d
Parent:        b54ea9fdabf2132ddbc46d0e65dd6bcf207cf521
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Apr 23 17:18:21 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon May 5 12:03:25 2014 +0200

testing: python agents are tested for working delay function

---
 fence/agents/alom/Makefile.am         |    2 ++
 fence/agents/amt/Makefile.am          |    2 ++
 fence/agents/apc/Makefile.am          |    2 ++
 fence/agents/apc_snmp/Makefile.am     |    2 ++
 fence/agents/bladecenter/Makefile.am  |    2 ++
 fence/agents/brocade/Makefile.am      |    2 ++
 fence/agents/cisco_mds/Makefile.am    |    2 ++
 fence/agents/cisco_ucs/Makefile.am    |    2 ++
 fence/agents/drac/Makefile.am         |    2 ++
 fence/agents/drac5/Makefile.am        |    2 ++
 fence/agents/eaton_snmp/Makefile.am   |    2 ++
 fence/agents/eps/Makefile.am          |    2 ++
 fence/agents/hds_cb/Makefile.am       |    2 ++
 fence/agents/hpblade/Makefile.am      |    2 ++
 fence/agents/ibmblade/Makefile.am     |    2 ++
 fence/agents/ifmib/Makefile.am        |    2 ++
 fence/agents/ilo/Makefile.am          |    2 ++
 fence/agents/ilo_mp/Makefile.am       |    2 ++
 fence/agents/intelmodular/Makefile.am |    2 ++
 fence/agents/ipdu/Makefile.am         |    2 ++
 fence/agents/ipmilan/Makefile.am      |    2 ++
 fence/agents/kdump/Makefile.am        |    2 ++
 fence/agents/ldom/Makefile.am         |    2 ++
 fence/agents/lpar/Makefile.am         |    2 ++
 fence/agents/netio/Makefile.am        |    2 ++
 fence/agents/ovh/Makefile.am          |    2 ++
 fence/agents/raritan/Makefile.am      |    2 ++
 fence/agents/rhevm/Makefile.am        |    2 ++
 fence/agents/rsa/Makefile.am          |    2 ++
 fence/agents/rsb/Makefile.am          |    2 ++
 fence/agents/sanbox2/Makefile.am      |    2 ++
 fence/agents/virsh/Makefile.am        |    2 ++
 fence/agents/vmware/Makefile.am       |    2 ++
 fence/agents/vmware_soap/Makefile.am  |    2 ++
 fence/agents/wti/Makefile.am          |    2 ++
 fence/agents/xenapi/Makefile.am       |    2 ++
 fence/agents/xenapi/fence_xenapi.py   |    2 --
 make/agentccheck.mk                   |    1 -
 make/agentpycheck.mk                  |   10 +++++++++-
 39 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/fence/agents/alom/Makefile.am b/fence/agents/alom/Makefile.am
index 94a910f..5900c2b 100644
--- a/fence/agents/alom/Makefile.am
+++ b/fence/agents/alom/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/amt/Makefile.am b/fence/agents/amt/Makefile.am
index cb2dea4..77b1b6d 100644
--- a/fence/agents/amt/Makefile.am
+++ b/fence/agents/amt/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/apc/Makefile.am b/fence/agents/apc/Makefile.am
index 5e76a1a..3699ca0 100644
--- a/fence/agents/apc/Makefile.am
+++ b/fence/agents/apc/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS		= -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/apc_snmp/Makefile.am b/fence/agents/apc_snmp/Makefile.am
index f6072e3..afc202d 100644
--- a/fence/agents/apc_snmp/Makefile.am
+++ b/fence/agents/apc_snmp/Makefile.am
@@ -12,6 +12,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/bladecenter/Makefile.am b/fence/agents/bladecenter/Makefile.am
index 0358228..883051f 100644
--- a/fence/agents/bladecenter/Makefile.am
+++ b/fence/agents/bladecenter/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/brocade/Makefile.am b/fence/agents/brocade/Makefile.am
index f83cfb1..cf0f85b 100644
--- a/fence/agents/brocade/Makefile.am
+++ b/fence/agents/brocade/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/cisco_mds/Makefile.am b/fence/agents/cisco_mds/Makefile.am
index b1be365..ce31dbd 100644
--- a/fence/agents/cisco_mds/Makefile.am
+++ b/fence/agents/cisco_mds/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n fc1/1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/cisco_ucs/Makefile.am b/fence/agents/cisco_ucs/Makefile.am
index 95f6d61..ae913ce 100644
--- a/fence/agents/cisco_ucs/Makefile.am
+++ b/fence/agents/cisco_ucs/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/drac/Makefile.am b/fence/agents/drac/Makefile.am
index be0f2b2..a57fbf9 100644
--- a/fence/agents/drac/Makefile.am
+++ b/fence/agents/drac/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/drac5/Makefile.am b/fence/agents/drac5/Makefile.am
index 8c288b2..8218181 100644
--- a/fence/agents/drac5/Makefile.am
+++ b/fence/agents/drac5/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/eaton_snmp/Makefile.am b/fence/agents/eaton_snmp/Makefile.am
index 135d153..16c141f 100644
--- a/fence/agents/eaton_snmp/Makefile.am
+++ b/fence/agents/eaton_snmp/Makefile.am
@@ -11,6 +11,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/eps/Makefile.am b/fence/agents/eps/Makefile.am
index 73c4064..e7e0d8a 100644
--- a/fence/agents/eps/Makefile.am
+++ b/fence/agents/eps/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/hds_cb/Makefile.am b/fence/agents/hds_cb/Makefile.am
index c999477..c5199a6 100644
--- a/fence/agents/hds_cb/Makefile.am
+++ b/fence/agents/hds_cb/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/hpblade/Makefile.am b/fence/agents/hpblade/Makefile.am
index e5e0cc2..10df51a 100644
--- a/fence/agents/hpblade/Makefile.am
+++ b/fence/agents/hpblade/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ibmblade/Makefile.am b/fence/agents/ibmblade/Makefile.am
index 87d6a95..cfcd4e6 100644
--- a/fence/agents/ibmblade/Makefile.am
+++ b/fence/agents/ibmblade/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS		= -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ifmib/Makefile.am b/fence/agents/ifmib/Makefile.am
index a90fd2d..f6538fe 100644
--- a/fence/agents/ifmib/Makefile.am
+++ b/fence/agents/ifmib/Makefile.am
@@ -11,6 +11,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am
index 0682bb7..598469b 100644
--- a/fence/agents/ilo/Makefile.am
+++ b/fence/agents/ilo/Makefile.am
@@ -12,6 +12,8 @@ sbin_SCRIPTS		= $(TARGET) $(SYMTARGET)
 
 man_MANS		= $(TARGET).8 $(SYMTARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 $(SYMTARGET): $(TARGET)
 	cp $^ $@
 
diff --git a/fence/agents/ilo_mp/Makefile.am b/fence/agents/ilo_mp/Makefile.am
index 6e0f40c..48901c6 100644
--- a/fence/agents/ilo_mp/Makefile.am
+++ b/fence/agents/ilo_mp/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/intelmodular/Makefile.am b/fence/agents/intelmodular/Makefile.am
index ed04439..fdc0625 100644
--- a/fence/agents/intelmodular/Makefile.am
+++ b/fence/agents/intelmodular/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ipdu/Makefile.am b/fence/agents/ipdu/Makefile.am
index a52ccfe..46857a4 100644
--- a/fence/agents/ipdu/Makefile.am
+++ b/fence/agents/ipdu/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am
index f9398ba..e2bc697 100644
--- a/fence/agents/ipmilan/Makefile.am
+++ b/fence/agents/ipmilan/Makefile.am
@@ -12,6 +12,8 @@ sbin_SCRIPTS		= $(TARGET) $(SYMTARGET)
 
 man_MANS		= $(TARGET).8 $(SYMTARGET:%=%.8)
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 $(SYMTARGET): $(TARGET)
 	cp $^ $@
 
diff --git a/fence/agents/kdump/Makefile.am b/fence/agents/kdump/Makefile.am
index 0752376..f90a873 100644
--- a/fence/agents/kdump/Makefile.am
+++ b/fence/agents/kdump/Makefile.am
@@ -13,6 +13,8 @@ fence_kdump_send_CFLAGS		= -D_GNU_SOURCE
 
 dist_man_MANS			= fence_kdump.8 fence_kdump_send.8
 
+FENCE_TEST_ARGS			= -n test
+
 include $(top_srcdir)/make/agentccheck.mk
 
 check: xml-check.fence_kdump
diff --git a/fence/agents/ldom/Makefile.am b/fence/agents/ldom/Makefile.am
index 203ceb5..e4989fb 100644
--- a/fence/agents/ldom/Makefile.am
+++ b/fence/agents/ldom/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/lpar/Makefile.am b/fence/agents/lpar/Makefile.am
index 1c0fcdc..cc7557f 100644
--- a/fence/agents/lpar/Makefile.am
+++ b/fence/agents/lpar/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1 --managed 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/netio/Makefile.am b/fence/agents/netio/Makefile.am
index e442051..461c1e0 100644
--- a/fence/agents/netio/Makefile.am
+++ b/fence/agents/netio/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/ovh/Makefile.am b/fence/agents/ovh/Makefile.am
index ff884a4..f833751 100644
--- a/fence/agents/ovh/Makefile.am
+++ b/fence/agents/ovh/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/raritan/Makefile.am b/fence/agents/raritan/Makefile.am
index 462945b..99e6a04 100644
--- a/fence/agents/raritan/Makefile.am
+++ b/fence/agents/raritan/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/rhevm/Makefile.am b/fence/agents/rhevm/Makefile.am
index da1a475..a8b22e1 100644
--- a/fence/agents/rhevm/Makefile.am
+++ b/fence/agents/rhevm/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/rsa/Makefile.am b/fence/agents/rsa/Makefile.am
index f660c18..eacacd6 100644
--- a/fence/agents/rsa/Makefile.am
+++ b/fence/agents/rsa/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/rsb/Makefile.am b/fence/agents/rsb/Makefile.am
index 6a3b23e..dc4cde0 100644
--- a/fence/agents/rsb/Makefile.am
+++ b/fence/agents/rsb/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/sanbox2/Makefile.am b/fence/agents/sanbox2/Makefile.am
index 0609330..345d1a4 100644
--- a/fence/agents/sanbox2/Makefile.am
+++ b/fence/agents/sanbox2/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/virsh/Makefile.am b/fence/agents/virsh/Makefile.am
index e467fa1..661d140 100644
--- a/fence/agents/virsh/Makefile.am
+++ b/fence/agents/virsh/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/vmware/Makefile.am b/fence/agents/vmware/Makefile.am
index 9f41c0d..9a4f860 100644
--- a/fence/agents/vmware/Makefile.am
+++ b/fence/agents/vmware/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= fence_vmware.8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 
diff --git a/fence/agents/vmware_soap/Makefile.am b/fence/agents/vmware_soap/Makefile.am
index 0fb0d53..0030dff 100644
--- a/fence/agents/vmware_soap/Makefile.am
+++ b/fence/agents/vmware_soap/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/wti/Makefile.am b/fence/agents/wti/Makefile.am
index 2d8c51d..acd7bec 100644
--- a/fence/agents/wti/Makefile.am
+++ b/fence/agents/wti/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -a test -n 1
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/xenapi/Makefile.am b/fence/agents/xenapi/Makefile.am
index 29c388f..144b8e4 100644
--- a/fence/agents/xenapi/Makefile.am
+++ b/fence/agents/xenapi/Makefile.am
@@ -10,6 +10,8 @@ sbin_SCRIPTS		= $(TARGET)
 
 man_MANS		= $(TARGET).8
 
+FENCE_TEST_ARGS         = -l test -p test -n 1 --session-url http://test
+
 include $(top_srcdir)/make/fencebuild.mk
 include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py
index afe2054..6f759d7 100644
--- a/fence/agents/xenapi/fence_xenapi.py
+++ b/fence/agents/xenapi/fence_xenapi.py
@@ -219,8 +219,6 @@ the status of virtual machines running on the host."
 	run_delay(options)
 
 	xen_session = connect_and_login(options)
-
-	# Operate the fencing device
 	result = fence_action(xen_session, options, set_power_fn, get_power_fn, get_outlet_list)
 
 	sys.exit(result)
diff --git a/make/agentccheck.mk b/make/agentccheck.mk
index d0dfb36..2de9b7a 100644
--- a/make/agentccheck.mk
+++ b/make/agentccheck.mk
@@ -12,4 +12,3 @@ xml-check.%: %
 xml-upload.%: %
 	$(eval INPUT=$(subst xml-upload.,,$@))
 	./$(INPUT) -o metadata > $(DATADIR)/$(INPUT).xml
-
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index 68f8aac..271e0bf 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,7 +1,7 @@
 TEMPFILE:=$(shell mktemp)
 DATADIR:=../../../tests/data/metadata
 
-check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%)
+check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%)
 
 xml-check.%: %
 	$(eval INPUT=$(subst xml-check.,,$@))
@@ -13,3 +13,11 @@ xml-upload.%: %
 	$(eval INPUT=$(subst xml-upload.,,$@))
 	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata > $(DATADIR)/$(INPUT).xml
 
+# If test will fail, rerun fence agents to show problems
+delay-check.%: %
+	$(eval INPUT=$(subst delay-check.,,$@))
+	test `PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib /usr/bin/time -f "%e" \
+	python ./$(INPUT) --delay 10 $(FENCE_TEST_ARGS) -- 2>&1 |\
+	sed 's/\.//' | tail -n 1` -ge 1000 || \
+	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib /usr/bin/time -f "%e" \
+	python ./$(INPUT) --delay 0 $(FENCE_TEST_ARGS) --


More information about the cluster-commits mailing list