Skip to content

Commit ebb2cb5

Browse files
committed
system tests: allow different order of gpg logs in PublishSnapshot38Test
1 parent ab18da3 commit ebb2cb5

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
Loading packages...
2-
Generating metadata files and linking package files...
1+
deb http://your-server/ stretch main
2+
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
3+
Don't forget to add your GPG key to apt with apt-key.
34
Finalizing metadata files...
4-
Signing file 'main_installer-s390x_current_images_SHA256SUMS' with gpg, please enter your passphrase when prompted:
5+
Generating metadata files and linking package files...
6+
Loading packages...
7+
Now you can add following line to apt sources:
8+
Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.
59
Signing file 'Release' with gpg, please enter your passphrase when prompted:
6-
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
7-
10+
Signing file 'main_installer-s390x_current_images_SHA256SUMS' with gpg, please enter your passphrase when prompted:
811
Snapshot stretch has been successfully published.
9-
Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.
10-
Now you can add following line to apt sources:
11-
deb http://your-server/ stretch main
12-
Don't forget to add your GPG key to apt with apt-key.
13-
1412
You can also use `aptly serve` to publish your repositories over HTTP quickly.

system/t06_publish/snapshot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,7 @@ class PublishSnapshot38Test(BaseTest):
11621162
]
11631163
runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec stretch"
11641164
gold_processor = BaseTest.expand_environ
1165+
sortOutput = True
11651166

11661167
def check(self):
11671168
super(PublishSnapshot38Test, self).check()

0 commit comments

Comments
 (0)