Removing the dependency of python requests

Author: root

osgtest/tests/test_465_xrootd_tpc.py

@@ -1,7 +1,6 @@
 import os
 import json
 import pwd
-import requests
 
 import osgtest.library.core as core
 import osgtest.library.files as files
@@ -18,34 +17,34 @@ def test_01_create_macaroons(self):
         usercert = '/tmp/x509up_u%d' % uid
         userkey = '/tmp/x509up_u%d' % uid
 
-        core.config['xrootd.tpc.url-1'] = "https://" + core.get_hostname() + ":9001" + "/usr/share/osg-test/test_gridftp_data.txt"
+        core.config['xrootd.tpc.url-1'] = "https://" + core.get_hostname() + ":9001" + "/usr/share/osg-test/test_gridftp_data.txt".strip()
         command = ('macaroon-init', core.config['xrootd.tpc.url-1'], '20', 'DOWNLOAD')
 
         status, stdout, stderr = core.system(command, user=True)
         fail = core.diagnose('Obtain Macaroon one',
                              command, status, stdout, stderr)
-        core.config['xrootd.tpc.macaroon-1'] = stdout.strip('\n')
+        core.config['xrootd.tpc.macaroon-1'] = stdout.strip()
 
-        core.config['xrootd.tpc.url-2'] = "https://" + core.get_hostname() + ":9002" + "/tmp/test_gridftp_data_tpc.txt"
+        core.config['xrootd.tpc.url-2'] = "https://" + core.get_hostname() + ":9002" + "/tmp/test_gridftp_data_tpc.txt".strip()
         command = ('macaroon-init', core.config['xrootd.tpc.url-2'], '20', 'UPLOAD')
         status, stdout, stderr = core.system(command, user=True)
         fail = core.diagnose('Obtain Macaroon number two',
                              command, status, stdout, stderr)
-        core.config['xrootd.tpc.macaroon-2'] = stdout.strip('\n')
+        core.config['xrootd.tpc.macaroon-2'] = stdout.strip()
 
 
     def test_02_initate_tpc(self):
-        core.skip_ok_unless_installed('xrootd', 'xrootd-scitokens', by_dependency=True)
-        session = requests.Session()
-        session.verify = False
+        core.skip_ok_unless_installed('xrootd', 'xrootd-scitokens', 'x509-scitokens-issuer-client', by_dependency=True)
         headers = {}
-        headers['Overwrite'] = 'T'
-        headers['Authorization'] = 'Bearer %s' % core.config['xrootd.tpc.macaroon-1']
-        headers['Source'] = core.config['xrootd.tpc.url-1']
-        headers['Copy-Header'] = 'Authorization: Bearer %s' % core.config['xrootd.tpc.macaroon-2']
-        resp = session.request('COPY',
-                               core.config['xrootd.tpc.url-2'], headers=headers,
-                               allow_redirects=True)
+        command = ('curl', '-A', 'Test', "-vk", "-X", "COPY",
+                   '-H', "Authorization: Bearer %s" % core.config['xrootd.tpc.macaroon-1'],
+                   '-H', "Source: %s" % core.config['xrootd.tpc.url-1'], 
+                   '-H', 'Overwrite: T', 
+                   '-H', 'Copy-Header:  Authorization: Bearer %s'% core.config['xrootd.tpc.macaroon-2'],
+                   core.config['xrootd.tpc.url-2'])
+        status, stdout, stderr = core.system(command, user=True)
+        fail = core.diagnose('Initiate third party copy',
+                             command, status, stdout, stderr)
         file_copied = os.path.exists("/tmp/test_gridftp_data_tpc.txt")
         self.assert_(file_copied, 'Copied file missing')
         chechskum_match = files.checksum_files_match("/tmp/test_gridftp_data_tpc.txt", "/usr/share/osg-test/test_gridftp_data.txt")

osgtest/tests/test_838_xrootd_tpc.py

@@ -17,3 +17,5 @@ def test_01_stop_xrootd(self):
         service.check_stop(core.config['xrootd_tpc_service_1'])
         service.check_stop(core.config['xrootd_tpc_service_2'])
 
+    def test_02_clean_test_files(self):
+        files.remove("/tmp/test_gridftp_data_tpc.txt", force=True)