Skip to content

Commit

Permalink
Merge pull request #82 from brianhlin/sw2751_drop_unused_tests
Browse files Browse the repository at this point in the history
Drop unused tests (SOFTWARE-2751)
  • Loading branch information
matyasselmeci authored Jun 28, 2017
2 parents d7d5b60 + 5394dfa commit 3172e2e
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 429 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# ------------------------------------------------------------------------------

PACKAGE := osg-test
VERSION := 1.10.1
VERSION := 1.11.0


# ------------------------------------------------------------------------------
Expand Down
4 changes: 0 additions & 4 deletions files/test_sequence
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ test_23_gratia
test_24_tomcat
test_25_voms_admin
test_26_bestman
test_27_osg_info_services
test_28_gsiopenssh
test_29_slurm
test_30_misc
Expand All @@ -42,8 +41,6 @@ test_58_gfal2util
test_53_gums
test_54_gratia
test_55_condorce
test_56_lcgutil
test_57_osg_info_services
test_59_gsiopenssh
test_74_slurm
test_75_gums
Expand All @@ -52,7 +49,6 @@ test_77_myproxy
test_78_voms
test_79_condorce
test_80_gratia
test_81_osg_info_services
test_82_cvmfs
test_83_rsv
test_84_xrootd
Expand Down
266 changes: 0 additions & 266 deletions osgtest/tests/test_27_osg_info_services.py

This file was deleted.

25 changes: 0 additions & 25 deletions osgtest/tests/test_30_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,3 @@ def test_02_osg_version(self):
osg_version_rpm_version = matches.group(1)
self.assert_(osg_version == osg_version_rpm_version)

def test_03_lfc_multilib(self):
# We do not ship lfc-* in OSG 3.3
self.skip_ok_if(core.osg_release().split('.') >= ['3','3'], message='OSG 3.3+')
# We do not build 32-bit packages on EL7
self.skip_ok_if(core.el_release() >= 7, message='running on EL7+')

core.skip_ok_unless_installed('yum-utils')

# We can't test this on 32-bit
uname_out, _, _ = core.check_system(['uname', '-i'], 'getting arch')
self.skip_ok_if(re.search(r'i\d86', uname_out), message='running on 32-bit')

cmdbase = ['repoquery', '--plugins']
for repo in core.options.extrarepos:
cmdbase.append('--enablerepo=%s' % repo)

# Find the 32-bit lfc-python rpm
stdout, _, _ = core.check_system(cmdbase + ['lfc-python.i386'], 'lfc-python multilib (32bit)')
if stdout.strip() == '':
self.fail('32-bit lfc-python not found in 64-bit repo')

# Sanity check: find the 64-bit lfc-python rpm
stdout, _, _ = core.check_system(cmdbase + ['lfc-python.x86_64'], 'lfc-python multilib (64bit)')
if stdout.strip() == '':
self.fail('64-bit lfc-python not found in 64-bit repo')
60 changes: 0 additions & 60 deletions osgtest/tests/test_56_lcgutil.py

This file was deleted.

Loading

0 comments on commit 3172e2e

Please sign in to comment.