vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-07 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix support for flat format repositories in subdirectories with common pool. #47

Browse Source
This commit is contained in:
Andrey Smirnov
2014-05-10 16:56:50 +04:00
parent 35eac72226
commit 10bbefeb25
10 changed files with 177 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t04_mirror/CreateMirror14Test_mirror_show
+1 -1
View File
@@ -1,6 +1,6 @@
Name: mirror14
Archive Root URL: http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/
Distribution:
Distribution: ./
Components:
Architectures:
Download Sources: no
system/t04_mirror/CreateMirror21Test_gold
+10
View File
@@ -0,0 +1,10 @@
Downloading http://pkg.jenkins-ci.org/debian-stable/binary/InRelease...
Downloading http://pkg.jenkins-ci.org/debian-stable/binary/Release...
Downloading http://pkg.jenkins-ci.org/debian-stable/binary/Release.gpg...
gpgv: DSA key ID D50582E6
gpgv: Good signature from "Kohsuke Kawaguchi <kk@kohsuke.org>"
gpgv: aka "Kohsuke Kawaguchi <kohsuke.kawaguchi@sun.com>"
gpgv: aka "[invalid image]"
Mirror [mirror21]: http://pkg.jenkins-ci.org/debian-stable/ ./binary/ successfully added.
You can run 'aptly mirror update mirror21' to download repository contents.
system/t04_mirror/CreateMirror21Test_mirror_show
+13
View File
@@ -0,0 +1,13 @@
Name: mirror21
Archive Root URL: http://pkg.jenkins-ci.org/debian-stable/
Distribution: ./binary/
Components:
Architectures:
Download Sources: no
Last update: never
Information from release file:
Architectures: all
Date: Thu, 01 May 2014 05:51:11 UTC
Origin: jenkins-ci.org
Suite: binary
system/t04_mirror/create.py
+17 -1
View File
@@ -211,7 +211,7 @@ class CreateMirror18Test(BaseTest):
class CreateMirror19Test(BaseTest):
"""
create mirror: mirror with / in components
create mirror: mirror with / in distribution
"""
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
@@ -235,3 +235,19 @@ class CreateMirror20Test(BaseTest):
runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror20 http://security.debian.org/ wheezy/updates main"
environmentOverride = {"HTTP_PROXY": "127.0.0.1:3137"}
expectedCode = 1
class CreateMirror21Test(BaseTest):
"""
create mirror: flat repository in subdir
"""
runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror21 http://pkg.jenkins-ci.org/debian-stable binary/"
fixtureGpg = True
outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
def check(self):
def removeSHA512(s):
return re.sub(r"SHA512: .+\n", "", s)
self.check_output()
self.check_cmd_output("aptly mirror show mirror21", "mirror_show", match_prepare=removeSHA512)