From 7e973d02439f10ad0b15e5d8fb0e35ddd401b5d8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 31 Oct 2014 11:11:52 +0100 Subject: [PATCH] some fixes collected --- osc-check_dups.py | 4 ++++ totest-manager.py | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/osc-check_dups.py b/osc-check_dups.py index e356ae1a..716e6486 100644 --- a/osc-check_dups.py +++ b/osc-check_dups.py @@ -24,6 +24,10 @@ def _checker_check_dups(self, project, opts): package = target.attrib['package'] if rqs.has_key(type + package): [oldid, oldsource] = rqs[type + package] + if oldid > id: + s = oldid + oldid = id + id = s assert oldid < id if source != None and oldsource != None: if (source.attrib['project'] == oldsource.attrib['project'] and diff --git a/totest-manager.py b/totest-manager.py index 3f7da61d..5df8a0ea 100755 --- a/totest-manager.py +++ b/totest-manager.py @@ -162,6 +162,8 @@ class ToTestBase(object): f = self.api.retried_GET(url) root = ET.parse(f).getroot() for repo in root.findall('result'): + if repo.get('repository') == 'ports': + continue if repo.get('dirty', '') == 'true': print repo.get('project'), repo.get('repository'), repo.get('arch'), 'dirty' return False @@ -337,19 +339,18 @@ class ToTestBase(object): class ToTestFactory(ToTestBase): known_failures = [ - 'opensuse-FTT-DVD-x86_64-Build-lvm@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_122@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-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-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', @@ -378,6 +379,9 @@ class ToTestFactory(ToTestBase): class ToTest132(ToTestBase): 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',