vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-01-12 03:21:33 +00:00
Code Issues Projects Releases Wiki Activity

Update system tests not to fail with GPG verification.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-07 01:23:11 +04:00
parent b532cb19ee
commit 39d2dd2483
9 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/t02_config/CreateConfigTest_gold
View File

@@ -4,5 +4,7 @@
"architectures": [],
"dependencyFollowSuggests": false,
"dependencyFollowRecommends": false,
"dependencyFollowAllVariants": false
"dependencyFollowAllVariants": false,
"gpgDisableSign": false,
"gpgDisableVerify": false
}

4
system/t03_help/MirrorCreateHelpTest_gold
View File

@@ -5,3 +5,7 @@ Create records information about new mirror and fetches Release file (it doesn't
ex:
$ aptly mirror create wheezy-main http://mirror.yandex.ru/debian/ wheezy main
Options:
-ignore-signatures=false: disable verification of Release file signatures
-keyring=: gpg keyring to use when verifying Release file (could be specified multiple times)

4
system/t03_help/MirrorCreateTest_gold
View File

@@ -2,3 +2,7 @@ Usage: aptly mirror create <name> <archive url> <distribution> [<component1> ...
aptly mirror create - create new mirror of Debian repository
Options:
-ignore-signatures=false: disable verification of Release file signatures
-keyring=: gpg keyring to use when verifying Release file (could be specified multiple times)

1
system/t04_mirror/CreateMirror6Test_gold
View File

@@ -1,2 +1,3 @@
Downloading http://mirror.yandex.ru/debian/dists/suslik/InRelease...
Downloading http://mirror.yandex.ru/debian/dists/suslik/Release...
ERROR: unable to fetch mirror: HTTP code 404 while fetching http://mirror.yandex.ru/debian/dists/suslik/Release

16
system/t04_mirror/create.py
View File

@@ -5,7 +5,7 @@ class CreateMirror1Test(BaseTest):
"""
create mirror: all architectures + all components
"""
runCmd = "aptly mirror create mirror1 http://mirror.yandex.ru/debian/ wheezy"
runCmd = "aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ wheezy"
def check(self):
self.check_output()
@@ -16,7 +16,7 @@ class CreateMirror2Test(BaseTest):
"""
create mirror: all architectures and 1 component
"""
runCmd = "aptly mirror create mirror2 http://mirror.yandex.ru/debian/ wheezy main"
runCmd = "aptly mirror create --ignore-signatures mirror2 http://mirror.yandex.ru/debian/ wheezy main"
def check(self):
self.check_output()
@@ -27,7 +27,7 @@ class CreateMirror3Test(BaseTest):
"""
create mirror: some architectures and 2 components
"""
runCmd = "aptly -architectures=i386,amd64 mirror create mirror3 http://mirror.yandex.ru/debian/ wheezy main contrib"
runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror3 http://mirror.yandex.ru/debian/ wheezy main contrib"
def check(self):
self.check_output()
@@ -40,7 +40,7 @@ class CreateMirror4Test(BaseTest):
"""
expectedCode = 1
runCmd = "aptly -architectures=i386,amd64 mirror create mirror4 http://mirror.yandex.ru/debian/ wheezy life"
runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror4 http://mirror.yandex.ru/debian/ wheezy life"
class CreateMirror5Test(BaseTest):
@@ -49,7 +49,7 @@ class CreateMirror5Test(BaseTest):
"""
expectedCode = 1
runCmd = "aptly -architectures=i386,nano68 mirror create mirror5 http://mirror.yandex.ru/debian/ wheezy"
runCmd = "aptly -architectures=i386,nano68 mirror create --ignore-signatures mirror5 http://mirror.yandex.ru/debian/ wheezy"
class CreateMirror6Test(BaseTest):
@@ -65,7 +65,7 @@ class CreateMirror7Test(BaseTest):
"""
create mirror: architectures fixed via config file
"""
runCmd = "aptly mirror create mirror7 http://mirror.yandex.ru/debian/ wheezy main contrib"
runCmd = "aptly mirror create --ignore-signatures mirror7 http://mirror.yandex.ru/debian/ wheezy main contrib"
configOverride = {"architectures": ["i386", "amd64"]}
def check(self):
@@ -78,7 +78,7 @@ class CreateMirror8Test(BaseTest):
create mirror: already exists
"""
fixtureCmds = [
"aptly mirror create mirror8 http://mirror.yandex.ru/debian/ wheezy main contrib"
"aptly mirror create --ignore-signatures mirror8 http://mirror.yandex.ru/debian/ wheezy main contrib"
]
runCmd = "aptly mirror create mirror8 http://mirror.yandex.ru/debian/ wheezy main contrib"
runCmd = "aptly mirror create --ignore-signatures mirror8 http://mirror.yandex.ru/debian/ wheezy main contrib"
expectedCode = 1

2
system/t04_mirror/drop.py
View File

@@ -6,7 +6,7 @@ class DropMirror1Test(BaseTest):
drop mirror: regular list
"""
fixtureCmds = [
"aptly mirror create mirror1 http://mirror.yandex.ru/debian/ wheezy",
"aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ wheezy",
]
runCmd = "aptly mirror drop mirror1"

6
system/t04_mirror/list.py
View File

@@ -6,9 +6,9 @@ class ListMirror1Test(BaseTest):
list mirrors: regular list
"""
fixtureCmds = [
"aptly mirror create mirror1 http://mirror.yandex.ru/debian/ wheezy",
"aptly mirror create mirror2 http://mirror.yandex.ru/debian/ squeeze contrib",
"aptly -architectures=i386 mirror create mirror3 http://mirror.yandex.ru/debian/ squeeze non-free",
"aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ wheezy",
"aptly mirror create --ignore-signatures mirror2 http://mirror.yandex.ru/debian/ squeeze contrib",
"aptly -architectures=i386 mirror create --ignore-signatures mirror3 http://mirror.yandex.ru/debian/ squeeze non-free",
]
runCmd = "aptly mirror list"

2
system/t04_mirror/show.py
View File

@@ -6,7 +6,7 @@ class ShowMirror1Test(BaseTest):
"""
show mirror: regular mirror
"""
fixtureCmds = ["aptly mirror create mirror1 http://mirror.yandex.ru/debian/ wheezy"]
fixtureCmds = ["aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ wheezy"]
runCmd = "aptly mirror show mirror1"

20
system/t04_mirror/update.py
View File

@@ -8,9 +8,9 @@ class UpdateMirror1Test(BaseTest):
"""
longTest = True
fixtureCmds = [
"aptly -architectures=i386,amd64 mirror create alsa-ppa http://ppa.launchpad.net/alsa-backports/ubuntu/ hardy main",
"aptly -architectures=i386,amd64 mirror create --ignore-signatures alsa-ppa http://ppa.launchpad.net/alsa-backports/ubuntu/ hardy main",
]
runCmd = "aptly mirror update alsa-ppa"
runCmd = "aptly mirror update --ignore-signatures alsa-ppa"
def output_processor(self, output):
return "\n".join(sorted(output.split("\n")))
@@ -29,10 +29,10 @@ class UpdateMirror3Test(BaseTest):
update mirrors: wrong checksum in release file
"""
fixtureCmds = [
"aptly mirror create failure ${url} hardy main",
"aptly mirror create --ignore-signatures failure ${url} hardy main",
]
fixtureWebServer = "test_release"
runCmd = "aptly mirror update failure"
runCmd = "aptly mirror update --ignore-signatures failure"
expectedCode = 1
def gold_processor(self, gold):
@@ -44,10 +44,10 @@ class UpdateMirror4Test(BaseTest):
update mirrors: wrong checksum in release file, but ignore
"""
fixtureCmds = [
"aptly mirror create failure ${url} hardy main",
"aptly mirror create --ignore-signatures failure ${url} hardy main",
]
fixtureWebServer = "test_release"
runCmd = "aptly mirror update -ignore-checksums failure"
runCmd = "aptly mirror update -ignore-checksums --ignore-signatures failure"
expectedCode = 1
def gold_processor(self, gold):
@@ -59,10 +59,10 @@ class UpdateMirror5Test(BaseTest):
update mirrors: wrong checksum in package
"""
fixtureCmds = [
"aptly mirror create failure ${url} hardy main",
"aptly mirror create --ignore-signatures failure ${url} hardy main",
]
fixtureWebServer = "test_release2"
runCmd = "aptly mirror update failure"
runCmd = "aptly mirror update --ignore-signatures failure"
expectedCode = 1
def gold_processor(self, gold):
@@ -74,10 +74,10 @@ class UpdateMirror6Test(BaseTest):
update mirrors: wrong checksum in package, but ignore
"""
fixtureCmds = [
"aptly mirror create failure ${url} hardy main",
"aptly mirror create --ignore-signatures failure ${url} hardy main",
]
fixtureWebServer = "test_release2"
runCmd = "aptly mirror update -ignore-checksums failure"
runCmd = "aptly mirror update -ignore-checksums --ignore-signatures failure"
def gold_processor(self, gold):
return string.Template(gold).substitute({'url': self.webServerUrl})