vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-04 05:10:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
jola5
2017-01-19 23:07:49 +01:00
committed by GitHub
parent 7c62a706c4 207ebffbb8
commit 4bf27d1dae
32 changed files with 261 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t05_snapshot/CreateSnapshot1Test_snapshot_show
+2
View File
@@ -2,6 +2,8 @@ Name: snap1
Created At: 2014-06-29 01:43:01 MSK
Description: Snapshot from mirror [wheezy-main]: http://mirror.yandex.ru/debian/ wheezy
Number of packages: 56121
Sources:
wheezy-main [repo]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/CreateSnapshot6Test_snapshot_show
+2
View File
@@ -1,6 +1,8 @@
Name: snap6
Description: Snapshot from local repo [local-repo]
Number of packages: 3
Sources:
local-repo [local]
Packages:
libboost-program-options-dev_1.49.0.1_i386
pyspi_0.6.1-1.3_source
system/t05_snapshot/FilterSnapshot1Test_snapshot_show
+2
View File
@@ -1,6 +1,8 @@
Name: snap2
Description: Filtered 'snap1', query was: 'mame unrar'
Number of packages: 4
Sources:
snap1 [snapshot]
Packages:
mame_0.146-5_amd64
unrar_1:4.1.4-1_amd64
system/t05_snapshot/FilterSnapshot2Test_snapshot_show
+2
View File
@@ -1,6 +1,8 @@
Name: snap2
Description: Filtered 'snap1', query was: 'rsyslog (>= 7.4.4)'
Number of packages: 9
Sources:
snap1 [snapshot]
Packages:
init-system-helpers_1.18~bpo70+1_all
libestr0_0.1.9-1~bpo70+1_amd64
system/t05_snapshot/FilterSnapshot3Test_snapshot_show
+2
View File
@@ -1,6 +1,8 @@
Name: snap2
Description: Filtered 'snap1', query was: 'Priority (required) nginx xyz'
Number of packages: 123
Sources:
snap1 [snapshot]
Packages:
debconf_1.5.49_all
debconf-i18n_1.5.49_all
system/t05_snapshot/FilterSnapshot7Test_snapshot_show
+2
View File
@@ -1,6 +1,8 @@
Name: snap2
Description: Filtered 'snap1', query was: 'rsyslog (>= 7.4.4), $Architecture (i386)'
Number of packages: 10
Sources:
snap1 [snapshot]
Packages:
init-system-helpers_1.18~bpo70+1_all
libestr0_0.1.9-1~bpo70+1_i386
system/t05_snapshot/MergeSnapshot1Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 02:23:49 MSK
Description: Merged from sources: 'snap1', 'snap2'
Number of packages: 56782
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/MergeSnapshot3Test_snapshot_show
+4
View File
@@ -2,6 +2,10 @@ Name: snap4
Created At: 2014-06-29 02:14:26 MSK
Description: Merged from sources: 'snap1', 'snap2', 'snap3'
Number of packages: 58968
Sources:
snap1 [snapshot]
snap2 [snapshot]
snap3 [snapshot]
Packages:
0ad-data_0.0.16-1~bpo70+1_all
0ad-data-common_0.0.16-1~bpo70+1_all
system/t05_snapshot/MergeSnapshot6Test_snapshot_show
+4
View File
@@ -2,6 +2,10 @@ Name: snap4
Created At: 2014-06-29 02:15:01 MSK
Description: Merged from sources: 'snap1', 'snap2', 'snap3'
Number of packages: 58802
Sources:
snap1 [snapshot]
snap2 [snapshot]
snap3 [snapshot]
Packages:
0ad-data_0.0.16-1~bpo70+1_all
0ad-data-common_0.0.16-1~bpo70+1_all
system/t05_snapshot/MergeSnapshot7Test_snapshot_show
+4
View File
@@ -2,6 +2,10 @@ Name: snap4
Created At: 2014-06-29 02:16:12 MSK
Description: Merged from sources: 'snap3', 'snap2', 'snap1'
Number of packages: 58817
Sources:
snap3 [snapshot]
snap2 [snapshot]
snap1 [snapshot]
Packages:
0ad-data_0~r11863-1_all
0ad-data-common_0.0.16-1~bpo70+1_all
system/t05_snapshot/MergeSnapshot9Test_snapshot_show
+4
View File
@@ -2,6 +2,10 @@ Name: snap4
Created At: 2014-06-29 02:19:14 MSK
Description: Merged from sources: 'snap1', 'snap2', 'snap3'
Number of packages: 61524
Sources:
snap1 [snapshot]
snap2 [snapshot]
snap3 [snapshot]
Packages:
0ad-data_0.0.16-1~bpo70+1_all
0ad-data_0~r11863-1_all
system/t05_snapshot/PullSnapshot10Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 02:00:49 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'rsyslog (>= 7.4.4)'
Number of packages: 73295
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot11Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 02:03:59 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'rsyslog (>= 7.4.4)'
Number of packages: 56130
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot1Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 02:31:20 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'mame unrar'
Number of packages: 56125
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot2Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 01:50:10 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'rsyslog (>= 7.4.4)'
Number of packages: 56126
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot3Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 01:52:15 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'rsyslog (>= 7.4.4)'
Number of packages: 56121
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot8Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 01:57:44 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'lunar-landing mars-landing (>= 1.0)'
Number of packages: 56121
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/PullSnapshot9Test_snapshot_show
+3
View File
@@ -2,6 +2,9 @@ Name: snap3
Created At: 2014-06-29 01:58:24 MSK
Description: Pulled into 'snap1' with 'snap2' as source, pull request was: 'rsyslog (>= 7.4.4)'
Number of packages: 56131
Sources:
snap1 [snapshot]
snap2 [snapshot]
Packages:
0ad-data_0~r11863-1_all
2ping_2.0-1_all
system/t05_snapshot/ShowSnapshot1Test_gold
+2
View File
@@ -2,6 +2,8 @@ Name: snap1
Created At: 2014-06-28 03:01:02 MSK
Description: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
Number of packages: 661
Sources:
wheezy-non-free [repo]
Packages:
abs-guide_6.5-1_all
album_4.06-2_all
system/t05_snapshot/ShowSnapshot3Test_gold
+2
View File
@@ -2,3 +2,5 @@ Name: snap1
Created At: 2014-01-24 13:06:43 MSK
Description: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
Number of packages: 661
Sources:
wheezy-non-free [repo]
system/t06_publish/PublishShow1Test_gold
+5
View File
@@ -0,0 +1,5 @@
Prefix: .
Distribution: maverick
Architectures: amd64 i386
Sources:
main: snap1 [snapshot]
system/t06_publish/PublishShow2Test_gold
+5
View File
@@ -0,0 +1,5 @@
Prefix: ppa/smira
Distribution: maverick
Architectures: amd64 i386
Sources:
main: snap1 [snapshot]
system/t06_publish/__init__.py
+1
View File
@@ -3,6 +3,7 @@ Testing publishing snapshots
"""
from .drop import *
from .show import *
from .list import *
from .repo import *
from .snapshot import *
system/t06_publish/show.py
+27
View File
@@ -0,0 +1,27 @@
from lib import BaseTest
class PublishShow1Test(BaseTest):
"""
publish show: existing snapshot
"""
fixtureDB = True
fixturePool = True
fixtureCmds = [
"aptly snapshot create snap1 from mirror gnuplot-maverick",
"aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1",
]
runCmd = "aptly publish show maverick"
class PublishShow2Test(BaseTest):
"""
publish show: under prefix
"""
fixtureDB = True
fixturePool = True
fixtureCmds = [
"aptly snapshot create snap1 from mirror gnuplot-maverick",
"aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1 ppa/smira",
]
runCmd = "aptly publish show maverick ppa/smira"
system/t12_api/graph.py
+5 -1
View File
@@ -17,6 +17,10 @@ class GraphAPITest(APITest):
self.check_equal(resp.headers["Content-Type"], "image/svg+xml")
self.check_equal(resp.content[:4], '<?xm')
resp = self.get("/api/graph.dot")
self.check_equal(resp.headers["Content-Type"], "text/plain; charset=utf-8")
self.check_equal(resp.content[:13], 'digraph aptly')
# make sure our default layout is horizontal
default = self.get("/api/graph.svg").content
horizontal = self.get("/api/graph.svg?layout=horizontal").content
@@ -32,4 +36,4 @@ class GraphAPITest(APITest):
svgVHeight = ET.fromstring(vertical).get('height').replace("pt","")
#self.check_gt(svgHWidth, svgVWidth)
#self.check_gt(svgVHeight, svgHHeight)
#self.check_gt(svgVHeight, svgHHeight)