[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH 2/2] Fill field "builder" in pkg_history



Hi,

Am Samstag, den 11.06.2011, 23:13 +0200 schrieb Joachim Breitner:
> no idea what’s wrong. Maybe the test cases in
> lib/debian/wannabuild/logs_tests.py don’t quite match the real world.
> Since for the test suite, by print-debugging, I know that when the line
> 
>         sql = tbl.insert().values(package=self.package,
>                                   distribution=self.suite,
>                                   version=self.version,
>                                   timestamp=datetime.utcfromtimestamp(self.timestamp),
>                                   result=self.state,
>                                   builder=self.builder,
>                                   build_time=self.build_time,
>                                   disk_space=self.disk_space)
> 
> is executed, self.builder has a sensible value.

I first suspected that maybe the format of the first line of the log
file has changes (which is parsed in _parse_arch), which seems to be the
case when I compare recent build logs with what’s in the test suite.

But then, the build is only extracted from the Sender field, in
_parse_sender. And even if the Sender is not in the expected format, it
should log "invalid sender F:'%s' S:'%s'" and set the builder to the
full content of the Sender line.

Per /org/buildd.debian.org/log/inject I see that this is not the case. I
also see the current format for the From lines ('buildd on antheil
<buildd@antheil.debian.org>'). If I put that in the test suite, it still
works. (Patch attached)

That’s all for now, I have no more ideas than that.

Greetings,
Joachim


-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
From 3bdca7edbd2f2b8b88dbdf9c14024e96bbc21177 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 19 Jun 2011 14:44:56 +0200
Subject: [PATCH] Use a more current From line in test cases

---
 lib/debian/wannabuild/logs_tests.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/debian/wannabuild/logs_tests.py b/lib/debian/wannabuild/logs_tests.py
index 94d729b..86744f0 100644
--- a/lib/debian/wannabuild/logs_tests.py
+++ b/lib/debian/wannabuild/logs_tests.py
@@ -175,7 +175,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for successful build of gobby_0.4.9-2+b2 on i386 (debian/unstable)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 
@@ -190,7 +190,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for successful build of gobby_0.4.9-2+b2 on i386 (debian/unstable)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 Content-Transfer-Encoding: base64
@@ -205,7 +205,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for successful build of gobby_0.4.9-2+b2 on i386 (debian/unstable)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 Content-Transfer-Encoding: quoted-printable
@@ -243,7 +243,7 @@ sbuild (Debian sbuild) 0.58.2 (18 Mar 2009) on buildd.net.philkern.de
         self.assertEqual(buildlog.version, '0.4.9-2+b2')
         self.assertEqual(buildlog.arch, 'i386')
         self.assertEqual(buildlog.suite, 'unstable')
-        self.assertEqual(buildlog.builder, 'something.local')
+        self.assertEqual(buildlog.builder, 'antheil.debian.org')
         # Commit the log to the database.  This should not raise any exception.
         filename = buildlog.store()
         self.assertEqual(buildlog.summary()[0],
@@ -409,7 +409,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for successful build of gobby_0.4.9-2 (dist=experimental)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 
@@ -428,7 +428,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for attempted build of gobby_0.4.9-2 on i386 (debian/unstable)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 
@@ -489,7 +489,7 @@ Received: from world by raff.debian.org with esmtp (Exim 4.63)       (envelope-f
 Subject: Log for attempted build of gobby_0.4.9-2 (dist=experimental)
 Message-ID: <20090122115647.4A47DB8413701@buildd.something.local>
 Date: Thu, 22 Jan 2009 03:56:47 -0800 (PST)
-From: buildd@something.local (Debian/i386 Build Daemon)
+From: buildd on antheil <buildd@antheil.debian.org>
 To: undisclosed-recipients:;
 Delivered-To: logs@buildd.somewhere
 
-- 
1.7.5.4

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: