Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: fix Debian repository format

Browse Source 
Use SHA256 instead of SHA1 - apt-get in Debian 9 rejects SHA1.
Fix date format (according to apt-get in Debian 9).
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-02 02:12:49 +02:00
parent 07ac6c9ba1
commit 72d60788e4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/network.py
View File

@ -518,10 +518,10 @@ class VmUpdatesMixin(qubes.tests.SystemTestsMixin):
p = self.netvm_repo.run( p = self.netvm_repo.run(
"mkdir -p /tmp/apt-repo/dists/test && " "mkdir -p /tmp/apt-repo/dists/test && "
"cd /tmp/apt-repo/dists/test && " "cd /tmp/apt-repo/dists/test && "
"cat > Release <<EOF && " "cat > Release && "
"echo '' $(sha1sum {p} | cut -f 1 -d ' ') $(stat -c %s {p}) {p}" "echo '' $(sha256sum {p} | cut -f 1 -d ' ') $(stat -c %s {p}) {p}"
" >> Release && " " >> Release && "
"echo '' $(sha1sum {z} | cut -f 1 -d ' ') $(stat -c %s {z}) {z}" "echo '' $(sha256sum {z} | cut -f 1 -d ' ') $(stat -c %s {z}) {z}"
" >> Release" " >> Release"
.format(p="main/binary-amd64/Packages", .format(p="main/binary-amd64/Packages",
z="main/binary-amd64/Packages.gz"), z="main/binary-amd64/Packages.gz"),
@ -531,11 +531,10 @@ class VmUpdatesMixin(qubes.tests.SystemTestsMixin):
"Label: Test repo\n" "Label: Test repo\n"
"Suite: test\n" "Suite: test\n"
"Codename: test\n" "Codename: test\n"
"Date: Tue, 27 Oct 2015 03:22:09 +0100\n" "Date: Tue, 27 Oct 2015 03:22:09 UTC\n"
"Architectures: amd64\n" "Architectures: amd64\n"
"Components: main\n" "Components: main\n"
"SHA1:\n" "SHA256:\n"
"EOF\n"
) )
p.stdin.close() p.stdin.close()
if p.wait() != 0: if p.wait() != 0:

1
tests/regressions.py
View File

@ -78,4 +78,3 @@ class TC_00_Regressions(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase)
p.stdin.close() p.stdin.close()
self.assertTrue(dispvm_name.startswith("disp"), self.assertTrue(dispvm_name.startswith("disp"),
"Try {} failed".format(try_no)) "Try {} failed".format(try_no))