Adapted test suite to xrootd4

test/testsuite/castortests/resources/xroot/tags.py

@@ -60,21 +60,14 @@ def xrdcpURLparam(self, nb=0):
 Setup.getTag_xrdcpURLparam = xrdcpURLparam
 
 def corexrdcp(self):
-    return os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrdcp'
+    return os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrdcp -np'
 Setup.getTag_corexrdcp = corexrdcp
 
 def xrdcp(self):
-    cmd = os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrdcp'
+    cmd = os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrdcp -np'
     return [cmd, 'KRB5CCNAME=nonexistinghost ' + cmd]
 Setup.getTag_xrdcp = xrdcp
 
-# This is the old xroot client, but we still use it for the prepare test
-# as the new client (3.3.x) does not provide the equivalent command. It should
-# be dropped once we adopt xroot 4.0.0, which provides a prepare command.
-def xrd(self):
-    return os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrd'
-Setup.getTag_xrd = xrd
-
 def xrdfs(self):
     return os.environ['XROOTSYS'] + os.sep + 'bin' + os.sep + 'xrdfs'
 Setup.getTag_xrdfs = xrdfs

test/testsuite/castortests/resources/xroot/xrdcp.input

 ls <corexrdcp>
-ls <xrd>
+ls <xrdfs>

test/testsuite/castortests/resources/xroot/xrdcp.output1

-<xrd>
+<xrdfs>

test/testsuite/castortests/xroot/chmod.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/isfileonline.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/isfileonline.output1

-Path:  <tapeFileName>
-Id:    <id1>
-Size:  <size1>
-Flags: 16 (IsReadable)
+Path:   <tapeFileName>
+Id:     <id1>
+Size:   <size1>
+Flags:  16 (IsReadable)

test/testsuite/castortests/xroot/isfileonline.output3

-Path:  <tapeFileName>
-Id:    <id1>
-Size:  <size1>
-Flags: 16 (IsReadable)
+Path:   <tapeFileName>
+Id:     <id1>
+Size:   <size1>
+Flags:  16 (IsReadable)

test/testsuite/castortests/xroot/isfileonline.output5

-Path:  <tapeFileName>
-Id:    0
-Size:  <size1>
-Flags: 12 (Other|Offline)
+Path:   <tapeFileName>
+Id:     0
+Size:   <size1>
+Flags:  12 (Other|Offline)

test/testsuite/castortests/xroot/mkdir.output1

-Path:  <noTapeFileName>
-Id:    <id1>
-Size:  0
-Flags: 2 (IsDir)
+Path:   <noTapeFileName>
+Id:     <id1>
+Size:   0
+Flags:  2 (IsDir)

test/testsuite/castortests/xroot/mode.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/prestage.input

@@ -2,7 +2,7 @@
 status=`stager_qry -M <tapeFileName> | tail -1 | awk '{print $NF;}'`; while [[ $status == 'CANBEMIGR' ]]; do sleep 15; status=`stager_qry -M <tapeFileName> | tail -1 | awk '{print $NF;}'` ; done
 stager_rm -M <tapeFileName>
 stager_qry -M <tapeFileName>
-<xrd> <stageHost> prepare <tapeFileName>
+<xrdfs> <stageHost> prepare <tapeFileName>
 stager_qry -M <tapeFileName>
 status=`stager_qry -M <tapeFileName> | tail -1 | awk '{print $NF;}'`; while [[ $status == 'STAGEIN' ]]; do sleep 15; status=`stager_qry -M <tapeFileName> | tail -1 | awk '{print $NF;}'` ; done
 stager_qry -M <tapeFileName>

test/testsuite/castortests/xroot/prestage.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/rm.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/stat.output2

-Path:  <noTapeFileName>
-Id:    <id1>
-Size:  0
-Flags: 19 (XBitSet|IsDir|IsReadable)
+Path:   <noTapeFileName>
+Id:     <id1>
+Size:   0
+Flags:  19 (XBitSet|IsDir|IsReadable)

test/testsuite/castortests/xroot/stat.output3

-Path:  <noTapeFileName>/file
-Id:    0
-Size:  0
-Flags: 12 (Other|Offline)
+Path:   <noTapeFileName>/file
+Id:     0
+Size:   0
+Flags:  12 (Other|Offline)

test/testsuite/castortests/xroot/svcClass.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/svcClass.output3

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed1> MB/s]

test/testsuite/castortests/xroot/thirdParty.output0

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed> MB/s]

test/testsuite/castortests/xroot/thirdParty.output2

-[xrootd] Total <bytes transfered>	|>...................| 0.00 % [<transfer speed1> MB/s]
[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed1> MB/s]

test/testsuite/castortests/xroot/thirdParty.output4

-[xrootd] Total <bytes transfered>	|====================| 100.00 % [<transfer speed2> MB/s]