From e554d8befad66d9a2a02fd95af0552977745eff9 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sat, 7 Jun 2014 17:01:37 +0400 Subject: [PATCH] Update tests with introduction of Release files under each arch/component. #61 --- system/t06_publish/repo.py | 7 +++++-- system/t06_publish/snapshot.py | 7 +++++-- system/t06_publish/switch.py | 8 ++++++-- system/t06_publish/update.py | 3 ++- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/system/t06_publish/repo.py b/system/t06_publish/repo.py index a11924fa..4bc8cc85 100644 --- a/system/t06_publish/repo.py +++ b/system/t06_publish/repo.py @@ -78,7 +78,8 @@ class PublishRepo1Test(BaseTest): raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-i386/Packages', 'main/binary-i386/Packages.bz2', 'main/binary-i386/Packages.gz', - 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2']): + 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2', + 'main/binary-i386/Release', 'main/source/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) @@ -468,7 +469,9 @@ class PublishRepo17Test(BaseTest): 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2', 'contrib/binary-i386/Packages', 'contrib/binary-i386/Packages.gz', 'contrib/binary-i386/Packages.bz2', - 'contrib/source/Sources', 'contrib/source/Sources.gz', 'contrib/source/Sources.bz2']): + 'contrib/source/Sources', 'contrib/source/Sources.gz', 'contrib/source/Sources.bz2', + 'main/source/Release', 'contrib/source/Release', + 'main/binary-i386/Release', 'contrib/binary-i386/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) diff --git a/system/t06_publish/snapshot.py b/system/t06_publish/snapshot.py index b3542a01..2bd12be5 100644 --- a/system/t06_publish/snapshot.py +++ b/system/t06_publish/snapshot.py @@ -73,7 +73,8 @@ class PublishSnapshot1Test(BaseTest): raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-amd64/Packages', 'main/binary-i386/Packages', 'main/binary-i386/Packages.gz', - 'main/binary-amd64/Packages.gz', 'main/binary-amd64/Packages.bz2', 'main/binary-i386/Packages.bz2']): + 'main/binary-amd64/Packages.gz', 'main/binary-amd64/Packages.bz2', 'main/binary-i386/Packages.bz2', + 'main/binary-amd64/Release', 'main/binary-i386/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) @@ -693,7 +694,9 @@ class PublishSnapshot26Test(BaseTest): 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2', 'contrib/binary-amd64/Packages', 'contrib/binary-i386/Packages', 'contrib/binary-i386/Packages.gz', 'contrib/binary-amd64/Packages.gz', 'contrib/binary-amd64/Packages.bz2', 'contrib/binary-i386/Packages.bz2', - 'contrib/source/Sources', 'contrib/source/Sources.gz', 'contrib/source/Sources.bz2',]): + 'contrib/source/Sources', 'contrib/source/Sources.gz', 'contrib/source/Sources.bz2', + 'main/binary-amd64/Release', 'main/binary-i386/Release', 'main/source/Release', + 'contrib/binary-amd64/Release', 'contrib/binary-i386/Release', 'contrib/source/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) diff --git a/system/t06_publish/switch.py b/system/t06_publish/switch.py index b9dabd83..f86e1f23 100644 --- a/system/t06_publish/switch.py +++ b/system/t06_publish/switch.py @@ -79,7 +79,8 @@ class PublishSwitch1Test(BaseTest): raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-amd64/Packages', 'main/binary-i386/Packages', 'main/binary-i386/Packages.gz', - 'main/binary-amd64/Packages.gz', 'main/binary-amd64/Packages.bz2', 'main/binary-i386/Packages.bz2']): + 'main/binary-amd64/Packages.gz', 'main/binary-amd64/Packages.bz2', 'main/binary-i386/Packages.bz2', + 'main/binary-amd64/Release', 'main/binary-i386/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) @@ -327,7 +328,10 @@ class PublishSwitch8Test(BaseTest): 'b/binary-i386/Packages.gz', 'c/binary-amd64/Packages.gz', 'a/binary-amd64/Packages.bz2', 'c/source/Sources.bz2', 'c/source/Sources.gz', 'a/source/Sources.bz2', 'b/binary-i386/Packages.bz2', 'a/binary-i386/Packages.gz', 'a/binary-amd64/Packages.gz', 'c/binary-i386/Packages.bz2', 'b/binary-amd64/Packages.gz', 'b/source/Sources', - 'c/binary-i386/Packages.gz', 'b/source/Sources.gz', 'b/binary-i386/Packages']): + 'c/binary-i386/Packages.gz', 'b/source/Sources.gz', 'b/binary-i386/Packages', + 'a/binary-amd64/Release', 'b/binary-amd64/Release', 'c/binary-amd64/Release', + 'a/binary-i386/Release', 'b/binary-i386/Release', 'c/binary-i386/Release', + 'a/source/Release', 'b/source/Release', 'c/source/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, )) diff --git a/system/t06_publish/update.py b/system/t06_publish/update.py index 0c6491b9..376c96a0 100644 --- a/system/t06_publish/update.py +++ b/system/t06_publish/update.py @@ -80,7 +80,8 @@ class PublishUpdate1Test(BaseTest): raise Exception("file hash doesn't match for %s: %s != %s" % (path, fileHash, h.hexdigest())) if pathsSeen != set(['main/binary-i386/Packages', 'main/binary-i386/Packages.bz2', 'main/binary-i386/Packages.gz', - 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2']): + 'main/source/Sources', 'main/source/Sources.gz', 'main/source/Sources.bz2', + 'main/binary-i386/Release', 'main/source/Release']): raise Exception("path seen wrong: %r" % (pathsSeen, ))