some fixes collected

This commit is contained in:
Stephan Kulow 2014-10-31 11:11:52 +01:00
parent efead90884
commit 7e973d0243
2 changed files with 13 additions and 5 deletions

View File

@ -24,6 +24,10 @@ def _checker_check_dups(self, project, opts):
package = target.attrib['package'] package = target.attrib['package']
if rqs.has_key(type + package): if rqs.has_key(type + package):
[oldid, oldsource] = rqs[type + package] [oldid, oldsource] = rqs[type + package]
if oldid > id:
s = oldid
oldid = id
id = s
assert oldid < id assert oldid < id
if source != None and oldsource != None: if source != None and oldsource != None:
if (source.attrib['project'] == oldsource.attrib['project'] and if (source.attrib['project'] == oldsource.attrib['project'] and

View File

@ -162,6 +162,8 @@ class ToTestBase(object):
f = self.api.retried_GET(url) f = self.api.retried_GET(url)
root = ET.parse(f).getroot() root = ET.parse(f).getroot()
for repo in root.findall('result'): for repo in root.findall('result'):
if repo.get('repository') == 'ports':
continue
if repo.get('dirty', '') == 'true': if repo.get('dirty', '') == 'true':
print repo.get('project'), repo.get('repository'), repo.get('arch'), 'dirty' print repo.get('project'), repo.get('repository'), repo.get('arch'), 'dirty'
return False return False
@ -337,19 +339,18 @@ class ToTestBase(object):
class ToTestFactory(ToTestBase): class ToTestFactory(ToTestBase):
known_failures = [ known_failures = [
'opensuse-FTT-DVD-x86_64-Build-lvm@64bit',
'opensuse-FTT-DVD-x86_64-Build-update_123@64bit', 'opensuse-FTT-DVD-x86_64-Build-update_123@64bit',
'opensuse-FTT-NET-i586-Build-lvm@32bit',
'opensuse-FTT-NET-x86_64-Build-update_121@64bit', 'opensuse-FTT-NET-x86_64-Build-update_121@64bit',
'opensuse-FTT-NET-x86_64-Build-update_122@64bit', 'opensuse-FTT-NET-x86_64-Build-update_122@64bit',
'opensuse-FTT-NET-x86_64-Build-update_123@64bit', 'opensuse-FTT-NET-x86_64-Build-update_123@64bit',
'opensuse-FTT-Rescue-CD-i686-Build-rescue@32bit',
'opensuse-FTT-Rescue-CD-x86_64-Build-rescue@64bit',
'opensuse-FTT-KDE-Live-x86_64-Build-kde-live@USBboot_64', # broken in 20140828
'opensuse-FTT-GNOME-Live-x86_64-Build-gnome-live@USBboot_64', # broken in 20140828 'opensuse-FTT-GNOME-Live-x86_64-Build-gnome-live@USBboot_64', # broken in 20140828
'opensuse-FTT-NET-x86_64-Build-zdup-13.2-M0@64bit', # broken in 20140915 'opensuse-FTT-NET-x86_64-Build-zdup-13.2-M0@64bit', # broken in 20140915
'opensuse-FTT-NET-i586-Build-zdup-13.1-kde@32bit', # broken in 20140915 'opensuse-FTT-NET-i586-Build-zdup-13.1-kde@32bit', # broken in 20140915
'opensuse-FTT-NET-x86_64-Build-zdup-13.1-gnome@64bit', # broken in 20140915 'opensuse-FTT-NET-x86_64-Build-zdup-13.1-gnome@64bit', # broken in 20140915
'opensuse-FTT-Rescue-CD-x86_64-Build-rescue@uefi-usb',
'opensuse-FTT-KDE-Live-x86_64-Build-kde-live@uefi-usb',
'opensuse-FTT-GNOME-Live-x86_64-Build-gnome-live@uefi-usb',
'opensuse-FTT-DVD-x86_64-Build-gnome@Laptop_64'
] ]
main_products = ['_product:openSUSE-dvd5-dvd-i586', main_products = ['_product:openSUSE-dvd5-dvd-i586',
@ -378,6 +379,9 @@ class ToTestFactory(ToTestBase):
class ToTest132(ToTestBase): class ToTest132(ToTestBase):
known_failures = [ known_failures = [
'opensuse-13.2-DVD-Biarch-i586-x86_64-Build-update_123@32bit',
'opensuse-13.2-DVD-Biarch-i586-x86_64-Build-update_122@32bit',
'opensuse-13.2-DVD-Biarch-i586-x86_64-Build-update_121@32bit'
] ]
main_products = ['_product:openSUSE-dvd5-dvd-i586', main_products = ['_product:openSUSE-dvd5-dvd-i586',