[Ltp-cvs] xmtest/tests/block-destroy 01_block-destroy_btblock_pos.py,1.1,1.2 05_block-destroy_byname_pos.py,1.1,1.2 Makefile.am,1.1,1.2

[Dan S. <dan...@us...>]

Update of /cvsroot/ltp/xmtest/tests/block-destroy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11762/tests/block-destroy

Modified Files:
	01_block-destroy_btblock_pos.py 05_block-destroy_byname_pos.py 
	Makefile.am 
Log Message:
Import of 0.3.5


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ltp/xmtest/tests/block-destroy/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	27 Oct 2005 16:55:09 -0000	1.1
--- Makefile.am	27 Oct 2005 17:02:32 -0000	1.2
***************
*** 8,13 ****
  	05_block-destroy_byname_pos.test
  
! XFAIL_TESTS = 04_block-destroy_nonattached_neg.test \
! 	05_block-destroy_byname_pos.test 
  
  EXTRA_DIST = $(TESTS) $(XFAIL_TESTS)
--- 8,12 ----
  	05_block-destroy_byname_pos.test
  
! XFAIL_TESTS = 
  
  EXTRA_DIST = $(TESTS) $(XFAIL_TESTS)

Index: 05_block-destroy_byname_pos.py
===================================================================
RCS file: /cvsroot/ltp/xmtest/tests/block-destroy/05_block-destroy_byname_pos.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 05_block-destroy_byname_pos.py	27 Oct 2005 16:55:09 -0000	1.1
--- 05_block-destroy_byname_pos.py	27 Oct 2005 17:02:32 -0000	1.2
***************
*** 6,16 ****
  from XmTestLib import *
  
! CONF_FILE = "/tmp/05_block-destroy_byname_pos.py"
! 
! conf = file(CONF_FILE, "w")
! conf.write("disk = [ \'phy:/dev/ram0,hda1,w\' ]\n")
! conf.close()
  
! domain = XmTestDomain(config=CONF_FILE)
  
  try:
--- 6,12 ----
  from XmTestLib import *
  
! domain = XmTestDomain()
  
! domain.configAddDisk("phy:/dev/ram0", "hda1", "w")
  
  try:

Index: 01_block-destroy_btblock_pos.py
===================================================================
RCS file: /cvsroot/ltp/xmtest/tests/block-destroy/01_block-destroy_btblock_pos.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 01_block-destroy_btblock_pos.py	27 Oct 2005 16:55:09 -0000	1.1
--- 01_block-destroy_btblock_pos.py	27 Oct 2005 17:02:32 -0000	1.2
***************
*** 6,16 ****
  from XmTestLib import *
  
! CONF_FILE = "/tmp/01_block-destroy_btblock_pos.py"
! 
! conf = file(CONF_FILE, "w")
! conf.write("disk = [ \'phy:/dev/ram0,hda1,w\' ]\n")
! conf.close()
  
! domain = XmTestDomain(config=CONF_FILE)
  
  try:
--- 6,12 ----
  from XmTestLib import *
  
! domain = XmTestDomain()
  
! domain.configAddDisk("phy:/dev/ram0", "hda1", "w")
  
  try:
***************
*** 48,50 ****
  
  if run["return"] == 0:
!     FAIL("domU reported block device still connected!" % run["return"])
--- 44,46 ----
  
  if run["return"] == 0:
!     FAIL("domU reported block device still connected!")