OSG 3.3 purge: drop gfal2util bestman tests

Author: matyasselmeci

osgtest/tests/test_580_gfal2util.py

@@ -20,60 +20,16 @@ def setUp(self):
     def get_srm_url_base(self):
         return 'srm://%s:%s/%s?SFN=' % (TestGFAL2Util.__hostname, TestGFAL2Util.__port, TestGFAL2Util.__sfn)
 
-    def get_srm_url(self):
-        return self.get_srm_url_base() + TestGFAL2Util.__remote_path
-
     def get_gftp_url_base(self):
         return 'gsiftp://%s/' % (TestGFAL2Util.__hostname)
 
-    def get_gftp_url(self):
-        return self.get_gftp_url_base() + TestGFAL2Util.__remote_path
-
     def setup_temp_paths(self):
         TestGFAL2Util.__temp_dir = tempfile.mkdtemp()
         TestGFAL2Util.__remote_path = TestGFAL2Util.__temp_dir + '/gfal2util_put_copied_file.txt'
         TestGFAL2Util.__local_path = TestGFAL2Util.__temp_dir + '/gfal2util_get_copied_file.txt'
         os.chmod(TestGFAL2Util.__temp_dir,0o777)
 
-        
-    @core.osgrelease(3.3)
-    def test_01_copy_local_to_server_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server', 'gfal2-plugin-srm', 'gums-service')
-        self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
-        self.setup_temp_paths()
-        os.chmod(TestGFAL2Util.__temp_dir, 0o777)
-        command = ('gfal-copy', '-v', 'file://' + TestGFAL2Util.__data_path, self.get_srm_url())
-        status, stdout, stderr = core.system(command, True)
-        fail = core.diagnose('gfal2-util copy, local to URL', command, status, stdout, stderr)
-        file_copied = os.path.exists(TestGFAL2Util.__remote_path)
-        self.assertEqual(status, 0, fail)
-        self.assert_(file_copied, 'Copied file missing')
-
-    @core.osgrelease(3.3)
-    def test_02_copy_server_to_local_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm', 'gums-service')
-        self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
-        command = ('gfal-copy', '-v', self.get_srm_url(), 'file://' + TestGFAL2Util.__local_path)
-        status, stdout, stderr = core.system(command, True)
-        fail = core.diagnose('gfal2-util copy, URL to local', command, status, stdout, stderr)
-        file_copied = os.path.exists(TestGFAL2Util.__local_path)
-        self.assertEqual(status, 0, fail)
-        self.assert_(file_copied, 'Copied file missing')
-        files.remove(TestGFAL2Util.__local_path)
-
-    @core.osgrelease(3.3)
-    def test_03_remove_server_file_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm', 'gums-service')
-        self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
-        command = ('gfal-rm', '-v', self.get_srm_url())
-        status, stdout, stderr = core.system(command, True)
-        fail = core.diagnose('gfal2-util remove, URL file', command, status, stdout, stderr)
-        file_removed = not os.path.exists(TestGFAL2Util.__remote_path)
-        self.assertEqual(status, 0, fail)
-        self.assert_(file_removed, 'Copied file still exists')
-        files.remove(TestGFAL2Util.__temp_dir)
-
-    def test_04_copy_server_to_local_gfal2_gftp_util(self):
+    def test_01_copy_server_to_local_gfal2_gftp_util(self):
          core.skip_ok_unless_installed('globus-gridftp-server-progs', 'gfal2-plugin-gridftp')
          self.skip_ok_unless(core.state['gridftp.running-server'], 'gridftp server not running')
          self.setup_temp_paths()
@@ -83,7 +39,7 @@ def test_04_copy_server_to_local_gfal2_gftp_util(self):
          self.assert_(file_copied, 'Copied file missing')
 
     @core.elrelease(7)
-    def test_05_copy_local_to_server_gfal2_util(self):
+    def test_02_copy_local_to_server_gfal2_util(self):
         core.skip_ok_unless_installed('globus-gridftp-server-progs', 'gfal2-plugin-gridftp')
         self.skip_ok_unless(core.state['gridftp.running-server'], 'gridftp server not running')
         file_not_created = not os.path.exists(TestGFAL2Util.__remote_path)
@@ -94,7 +50,7 @@ def test_05_copy_local_to_server_gfal2_util(self):
         self.assert_(file_copied, 'Copied file missing')
 
     @core.elrelease(7)
-    def test_06_remove_server_file_gfal2_util_gftp(self):
+    def test_03_remove_server_file_gfal2_util_gftp(self):
         core.skip_ok_unless_installed('globus-gridftp-server-progs', 'gfal2-plugin-gridftp')
         self.skip_ok_unless(core.state['gridftp.running-server'], 'gridftp server not running')
         command = ('gfal-rm', '-v', self.get_gftp_url_base() + TestGFAL2Util.__remote_path)
@@ -103,4 +59,3 @@ def test_06_remove_server_file_gfal2_util_gftp(self):
         self.assert_(file_removed, 'Copied file still exists')
         files.remove(TestGFAL2Util.__remote_path)
         files.remove(TestGFAL2Util.__local_path)
-