[SCM] pkg-kde-jenkins packaging branch, master, updated. c020108c412f726f4b3ac49e71d4d8225cd11531

Maximiliano Curia maxy at moszumanska.debian.org
Thu May 12 10:48:33 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=95386b3

The following commit has been merged in the master branch:
commit 95386b3b30a7e763671399b841b74818baeee263
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue May 10 10:17:24 2016 +0200

    Type error
---
 scripts/adt2junit.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/adt2junit.py b/scripts/adt2junit.py
index f3a3b18..0003ddd 100755
--- a/scripts/adt2junit.py
+++ b/scripts/adt2junit.py
@@ -5,7 +5,7 @@ import argparse
 import sys
 
 from junit_xml import TestSuite, TestCase
-from pyparsing import (LineStart, OneOrMore,
+from pyparsing import (LineStart, Literal, OneOrMore,
                        Regex, SkipTo, Word, ZeroOrMore, alphanums,
                        matchPreviousExpr)
 
@@ -20,17 +20,19 @@ class Test(object):
         self.name = tokens.name
         self.output = tokens.output[0]
         self.status = tokens.status
+        print(self)
 
     def __str__(self):
         return "{{Test {} {}}}".format(self.name, self.status)
 
 hour = Regex(r'[0-9]{2}:[0-9]{2}:[0-9]{2}')
 
-adt_msg = 'adt-run' + '[' + hour + ']:'
+adt_msg = Literal('adt-run') + '[' + hour + ']:'
+adt_msg_line = LineStart() + adt_msg
 
 adt_testname = Word(alphanums).setResultsName('name')
 
-adt_start = LineStart() + adt_msg + 'test' + adt_testname + ':' + '[' + OneOrMore('-')
+adt_start = adt_msg_line + 'test' + adt_testname + ':' + '[' + OneOrMore('-')
 adt_end = (
     adt_msg + 'test' + matchPreviousExpr(adt_testname) + ':' +
     OneOrMore('-') + ']'

-- 
pkg-kde-jenkins packaging



More information about the pkg-kde-commits mailing list