bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pactest: sort repos by alpha order in config file

Browse source 
The order was non-deterministic before, and just happened to work for
sync023.py as it was written. Ensure there is some sort of predictable
ordering.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-22 16:11:33 -06:00
parent b3d71bf7d0
commit a99e7272b8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/pacman/tests/sync023.py
View file

@ -15,7 +15,8 @@ for p in lp1, lp2, lp3, sp1, sp2, sp3, newp1:
for p in lp1, lp2, lp3: for p in lp1, lp2, lp3:
self.addpkg2db("local", p) self.addpkg2db("local", p)
self.addpkg2db("testing", newp1); # repos are sorted in alpha order
self.addpkg2db("atesting", newp1);
for p in sp1, sp2, sp3: for p in sp1, sp2, sp3:
self.addpkg2db("sync", p); self.addpkg2db("sync", p);

5
test/pacman/util.py
View file

@ -125,8 +125,11 @@ def mkcfgfile(filename, root, option, db):
data.extend(["%s = %s" % (key, j) for j in value]) data.extend(["%s = %s" % (key, j) for j in value])
# Repositories # Repositories
for key, value in db.iteritems(): # sort by repo name so tests can predict repo order, rather than be
# subjects to the whims of python dict() ordering
for key in sorted(db.iterkeys()):
if key != "local": if key != "local":
value = db[key]
data.append("[%s]\n" \ data.append("[%s]\n" \
"Server = file://%s" \ "Server = file://%s" \
% (value.treename, % (value.treename,