[CVS] RPM: mancoosi/framework/ rpmtest.py
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: mancoosi Date: 05-Apr-2011 13:07:58
Branch: HEAD Handle: 2011040511075700
Modified files:
mancoosi/framework rpmtest.py
Log:
- WIP.
Summary:
RevisionChanges Path
1.5 +79 -123mancoosi/framework/rpmtest.py
patch -p0 '@@ .'
Index: mancoosi/framework/rpmtest.py
$ cvs diff -u -r1.4 -r1.5 rpmtest.py
--- mancoosi/framework/rpmtest.py 4 Apr 2011 19:20:35 - 1.4
+++ mancoosi/framework/rpmtest.py 5 Apr 2011 11:07:57 - 1.5
@@ -21,10 +21,6 @@
initial_contents = {} # PKGNAME: [(FILE, mtime),...]
initial_versions = {} # PKGNAME: (NEVRA, INSTALLTID)
-#mainrelease_dir = '/tmp/rpms/baseline/'
-#multi_updates_dir = '/home/agrr/pacotes/multi-updates/'
-#multi_release_dir = '/home/agrr/pacotes/multi-base/'
-precondition_dir = CM15/RPMS/
bin_rpm =/bin/rpm
var_lib_rpm ='/var/lib/rpm/'
@@ -45,16 +41,25 @@
self.maxdelay = maxdelay
self.erase_maxdelay = maxdelay
self.query_maxdelay = maxdelay
+ self.verify_maxdelay = maxdelay
self.install_maxdelay = maxdelay
self.ts = None
self.killtimes = []
-self.success_cases = 0
- self.details = [0,0] # (no. of transactions, no. of nop transactions)
+
self.stats = {}
+self.stats['tests_run'] = 0
+self.stats['tests_success'] = 0
+ self.stats['tests_updated'] = 0
+ self.stats['tests_nochange'] = 0
+ self.stats['version_wrong'] = 0 # XXX unused
+self.stats['files_wrong'] = 0# XXX unused
+
self.stats['stale_lock'] = 0
self.stats['recover_failed'] = 0
self.stats['script_error'] = 0
+ self.stats['deps_missing'] = 0
self.stats['file_truncated'] = 0
+ self.stats['ldconfig_file_empty'] = 0
self.stats['config_rpmnew'] = 0
self.stats['config_rpmsave'] = 0
@@ -75,14 +80,18 @@
self.created_as = '^warning: (.*) created as (.*)'
self.saved_as = '^warning: (.*) saved as (.*)'
# ldconfig: file /usr/lib/libldap-2.4.so.2.5.5;4d99f2c1 is truncated
-self.file_truncated = '^ldconfig: file ([^ ]*) is truncated'
+# ldconfig: File /usr/lib/libmimerS.so.1.0.0;4d9a25ae is empty, not checked.
+self.ldconfig_file_truncated = '^ldconfig: file ([^ ]*) is truncated'
+ self.ldconfig_file_empty = '^ldconfig: File ([^ ]*) is empty, not
checked.'
# warning: cleaning stale lock
self.script_pats = [
+# bind
'rndc: decode base64 secret: bad base64 encoding',
'rndc: connect failed: 127.0.0.1#953: connection refused',
+# openldap-servers
+ 'Usage: service -[Rfshv] SERVICE ARGUMENTS',
]
-
def bad(self, args):
print colored(args, 'red')
@@ -91,14 +100,14 @@
# Run a command.
def run(self, args):
-print 'Running: ' + str(args)
+#print 'Running: ' + str(args)
po = subprocess.Popen(args, stdout=None, stderr=None)
res = po.wait() == 0
return res
# Run a command with a watchdog timer.
def timed(self, args, delay):
-print 'Running(' + str(delay) + '): ' + str(args)
+#print 'Running(' + str(delay) + '): ' + str(args)
po = subprocess.Popen(args, stdout=None, stderr=None)
pid = po.pid
res = None
@@ -118,7 +127,7 @@
# Run a command capturing stdout/stderr.
def communicate(self, args):
-print 'Running: ' + str(args)
+#print 'Running: ' + str(args)
xx = subprocess.Popen(args, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()
return xx
@@ -140,14 +149,23 @@
continue
mo = re.match(self.is_needed_by, l)
if mo:
+ self.stats['deps_missing'] += 1
+ self.bad(missing: + mo.group(0))
continue
-mo = re.match(self.file_truncated, l)
+mo = re.match(self.ldconfig_file_truncated, l)
if mo:
fn = mo.group(1)
- self.stats['file_truncated'] += 1
+ self.stats['ldconfig_file_truncated'] += 1
self.bad(truncated: + fn)
os.unlink(fn)
continue
+mo =
[CVS] RPM: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:29:41 Branch: HEAD Handle: 2011040519294000 Modified files: rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3601 +1 -0 rpm/CHANGES 2.125 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3600 -r1.3601 CHANGES --- rpm/CHANGES 3 Apr 2011 22:58:05 - 1.3600 +++ rpm/CHANGES 5 Apr 2011 19:29:40 - 1.3601 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.125 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:29:40 - 2.125 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:30:32 Branch: rpm-5_4 Handle: 2011040519303101 Modified files: (Branch: rpm-5_4) rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3501.2.100+1 -0 rpm/CHANGES 2.124.4.1 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.99 -r1.3501.2.100 CHANGES --- rpm/CHANGES 3 Apr 2011 22:58:47 - 1.3501.2.99 +++ rpm/CHANGES 5 Apr 2011 19:30:31 - 1.3501.2.100 @@ -1,4 +1,5 @@ 5.4.0 - 5.4.1: +- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.124.4.1 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:30:32 - 2.124.4.1 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:31:37 Branch: rpm-5_3 Handle: 2011040519313601 Modified files: (Branch: rpm-5_3) rpm CHANGES build.c Log: accept unicode characters. Summary: RevisionChanges Path 1.3296.2.199+1 -0 rpm/CHANGES 2.124.2.1 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.198 -r1.3296.2.199 CHANGES --- rpm/CHANGES 2 Apr 2011 03:20:14 - 1.3296.2.198 +++ rpm/CHANGES 5 Apr 2011 19:31:36 - 1.3296.2.199 @@ -1,4 +1,5 @@ 5.3.10 - 5.3.11 +- proyvind: rpmbuild: accept unicode characters. - mdawkins: tagged 5.3.10 release in configure.ac 5.3.9 - 5.3.10 @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124 -r2.124.2.1 build.c --- rpm/build.c 10 Feb 2010 20:24:49 - 2.124 +++ rpm/build.c 5 Apr 2011 19:31:37 - 2.124.2.1 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:50:24 Branch: HEAD Handle: 2011040519502400 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.126 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.125 -r2.126 build.c --- rpm/build.c 5 Apr 2011 19:29:40 - 2.125 +++ rpm/build.c 5 Apr 2011 19:50:24 - 2.126 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:51:49 Branch: HEAD Handle: 2011040519514900 Modified files: rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3602 +0 -1 rpm/CHANGES 2.127 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3601 -r1.3602 CHANGES --- rpm/CHANGES 5 Apr 2011 19:29:40 - 1.3601 +++ rpm/CHANGES 5 Apr 2011 19:51:49 - 1.3602 @@ -1,5 +1,4 @@ 5.4.0 - 5.4.1: -- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.126 -r2.127 build.c --- rpm/build.c 5 Apr 2011 19:50:24 - 2.126 +++ rpm/build.c 5 Apr 2011 19:51:49 - 2.127 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s))) return 0; + if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:54:44 Branch: rpm-5_3 Handle: 2011040519544301 Modified files: (Branch: rpm-5_3) rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3296.2.200+0 -1 rpm/CHANGES 2.124.2.2 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.199 -r1.3296.2.200 CHANGES --- rpm/CHANGES 5 Apr 2011 19:31:36 - 1.3296.2.199 +++ rpm/CHANGES 5 Apr 2011 19:54:43 - 1.3296.2.200 @@ -1,5 +1,4 @@ 5.3.10 - 5.3.11 -- proyvind: rpmbuild: accept unicode characters. - mdawkins: tagged 5.3.10 release in configure.ac 5.3.9 - 5.3.10 @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124.2.1 -r2.124.2.2 build.c --- rpm/build.c 5 Apr 2011 19:31:37 - 2.124.2.1 +++ rpm/build.c 5 Apr 2011 19:54:44 - 2.124.2.2 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:55:02 Branch: HEAD Handle: 2011040519550100 Modified files: rpm build.c Log: revert unicode change Summary: RevisionChanges Path 2.128 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.127 -r2.128 build.c --- rpm/build.c 5 Apr 2011 19:51:49 - 2.127 +++ rpm/build.c 5 Apr 2011 19:55:01 - 2.128 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES build.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 05-Apr-2011 21:55:34 Branch: rpm-5_4 Handle: 2011040519553400 Modified files: (Branch: rpm-5_4) rpm CHANGES build.c Log: revert unicode change Summary: RevisionChanges Path 1.3501.2.101+0 -1 rpm/CHANGES 2.124.4.2 +1 -1 rpm/build.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.100 -r1.3501.2.101 CHANGES --- rpm/CHANGES 5 Apr 2011 19:30:31 - 1.3501.2.100 +++ rpm/CHANGES 5 Apr 2011 19:55:34 - 1.3501.2.101 @@ -1,5 +1,4 @@ 5.4.0 - 5.4.1: -- proyvind: rpmbuild: accept unicode characters. - jbj: mongo: drag-in the test suite. grdfs/replica_sets todo++. - jbj: mongo: and re-export the mongo-c-driver through librpmio.vers. - jbj: mongo: pull in the gridfs methods from the mongo-c-driver too. @@ . patch -p0 '@@ .' Index: rpm/build.c $ cvs diff -u -r2.124.4.1 -r2.124.4.2 build.c --- rpm/build.c 5 Apr 2011 19:30:32 - 2.124.4.1 +++ rpm/build.c 5 Apr 2011 19:55:34 - 2.124.4.2 @@ -88,7 +88,7 @@ /*@switchbreak@*/ break; /*@-boundsread@*/ default: - if (checking !(isprint(*s) || isspace(*s)) *(unsigned char *)s 32) return 0; + if (checking !(isprint(*s) || isspace(*s))) return 0; /*@switchbreak@*/ break; /*@=boundsread@*/ } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/build/ parseDescription.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 05-Apr-2011 23:36:01
Branch: rpm-5_3 Handle: 201104052136
Modified files: (Branch: rpm-5_3)
rpm/build parseDescription.c
Log:
don't delete the inherited %description (mdvbz#62979)
uncertain about the correct behaviour here, I assume that what is supposed
to
happen is that missing %description for a sub-package should result in no
%description (thus an error), which doesn't seem to be the actual behaviour.
The type returned by headerGet() is not what is expected either..
Placing under a mandriva #ifdef for now...
Summary:
RevisionChanges Path
2.44.2.1+2 -0 rpm/build/parseDescription.c
patch -p0 '@@ .'
Index: rpm/build/parseDescription.c
$ cvs diff -u -r2.44 -r2.44.2.1 parseDescription.c
--- rpm/build/parseDescription.c 16 Feb 2010 15:12:21 - 2.44
+++ rpm/build/parseDescription.c 5 Apr 2011 21:36:00 - 2.44.2.1
@@ -90,6 +90,7 @@
}
/* Lose the inheirited %description (if present). */
+#if !defined(RPM_VENDOR_MANDRIVA) /* mdvbz#62979 */
{HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
int xx;
he-tag = RPMTAG_DESCRIPTION;
@@ -98,6 +99,7 @@
if (xx he-t == RPM_STRING_TYPE)
xx = headerDel(pkg-header, he, 0);
}
+#endif
t = stashSt(spec, pkg-header, RPMTAG_DESCRIPTION, lang);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
