yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2362 from coolo/fix_select3

Browse Source 
Don't take multibuild packages as subpackage of itself
This commit is contained in:
Max Lin 2019-12-06 19:39:14 +08:00 committed by GitHub
commit 8f62f42ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/stagingapi.py
View File

@ -946,7 +946,7 @@ class StagingAPI(object):
# created before through get_sub_packages(). # created before through get_sub_packages().
filelist = self.get_filelist_for_package(pkgname=package, project=project, expand='1') filelist = self.get_filelist_for_package(pkgname=package, project=project, expand='1')
if '_multibuild' in filelist: if '_multibuild' in filelist:
return [package] return []
mainspec = "{}{}".format(package, '.spec') mainspec = "{}{}".format(package, '.spec')
if mainspec in filelist: if mainspec in filelist:

14
tests/select_tests.py
View File

@ -11,6 +11,7 @@ from osclib.select_command import SelectCommand
from osclib.unselect_command import UnselectCommand from osclib.unselect_command import UnselectCommand
from osclib.stagingapi import StagingAPI from osclib.stagingapi import StagingAPI
from osclib.memoize import memoize_session_reset from osclib.memoize import memoize_session_reset
from osclib.core import source_file_load
import logging import logging
from mock import MagicMock from mock import MagicMock
@ -55,7 +56,7 @@ class TestSelect(unittest.TestCase):
project = self.wf.create_project('devel:gcc') project = self.wf.create_project('devel:gcc')
package = OBSLocal.Package(name='gcc8', project=project) package = OBSLocal.Package(name='gcc8', project=project)
package.create_commit(filename='gcc8.spec') package.create_commit(filename='gcc8.spec', text='Name: gcc8')
package.create_commit(filename='gcc8-tests.spec') package.create_commit(filename='gcc8-tests.spec')
self.wf.submit_package(package) self.wf.submit_package(package)
@ -63,6 +64,12 @@ class TestSelect(unittest.TestCase):
self.assertEqual(True, ret) self.assertEqual(True, ret)
self.assertEqual(package_list(self.wf.apiurl, staging.name), ['gcc8', 'gcc8-tests']) self.assertEqual(package_list(self.wf.apiurl, staging.name), ['gcc8', 'gcc8-tests'])
file = source_file_load(self.wf.apiurl, staging.name, 'gcc8', 'gcc8.spec')
self.assertEqual(file, 'Name: gcc8')
# we should see the spec file also in the 2nd package
file = source_file_load(self.wf.apiurl, staging.name, 'gcc8-tests', 'gcc8.spec')
self.assertEqual(file, 'Name: gcc8')
uc = UnselectCommand(self.wf.api) uc = UnselectCommand(self.wf.api)
self.assertIsNone(uc.perform(['gcc8'], False, None)) self.assertIsNone(uc.perform(['gcc8'], False, None))
@ -75,7 +82,7 @@ class TestSelect(unittest.TestCase):
project = self.wf.create_project('devel:gcc') project = self.wf.create_project('devel:gcc')
package = OBSLocal.Package(name='gcc9', project=project) package = OBSLocal.Package(name='gcc9', project=project)
package.create_commit(filename='gcc9.spec') package.create_commit(filename='gcc9.spec', text='Name: gcc9')
package.create_commit(filename='gcc9-tests.spec') package.create_commit(filename='gcc9-tests.spec')
package.create_commit('<multibuild><flavor>gcc9-tests.spec</flavor></multibuild>', filename='_multibuild') package.create_commit('<multibuild><flavor>gcc9-tests.spec</flavor></multibuild>', filename='_multibuild')
self.wf.submit_package(package) self.wf.submit_package(package)
@ -84,6 +91,9 @@ class TestSelect(unittest.TestCase):
self.assertEqual(True, ret) self.assertEqual(True, ret)
self.assertEqual(package_list(self.wf.apiurl, staging.name), ['gcc9']) self.assertEqual(package_list(self.wf.apiurl, staging.name), ['gcc9'])
file = source_file_load(self.wf.apiurl, staging.name, 'gcc9', 'gcc9.spec')
self.assertEqual(file, 'Name: gcc9')
uc = UnselectCommand(self.wf.api) uc = UnselectCommand(self.wf.api)
self.assertIsNone(uc.perform(['gcc9'], False, None)) self.assertIsNone(uc.perform(['gcc9'], False, None))