Skip to content

Commit f5192e8

Browse files
committed
Updating test data
1 parent 3b3e9ef commit f5192e8

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
C:Q1TXVgzyQiVmY+lk5/cMY6XdPA4CI=
1+
C:Q1IZdVsEDSxN0qfNVNB4uePz6O/fY=
22
P:samba-client
3-
V:4.19.6-r0
3+
V:4.19.9-r0
44
A:x86_64
5-
S:678507
5+
S:678672
66
I:2490368
77
T:Samba client programs
88
U:https://www.samba.org/
99
L:GPL-3.0-or-later AND LGPL-3.0-or-later
1010
o:samba
1111
m:Natanael Copa <[email protected]>
12-
t:1716198147
13-
c:b4a9e905062153013701be64f4bec53be3cb2008
14-
D:samba-libs=4.19.6-r0 samba-common=4.19.6-r0 so:libCHARSET3-samba4.so so:libaddns-samba4.so so:libarchive.so.13 so:libc.musl-x86_64.so.1 so:libcli-cldap-samba4.so so:libcli-ldap-samba4.so so:libcli-smb-common-samba4.so so:libcli-spoolss-samba4.so so:libcliauth-samba4.so so:libcmdline-contexts-samba4.so so:libcmdline-samba4.so so:libcom-err-samba4.so so:libdbwrap-samba4.so so:libdcerpc-binding.so.0 so:libdcerpc-samba-samba4.so so:libevents-samba4.so so:libformw.so.6 so:libgenrand-samba4.so so:libgensec-samba4.so so:libgnutls.so.30 so:libkrb5-samba4.so so:libkrb5samba-samba4.so so:libldb.so.2 so:libldbsamba-samba4.so so:liblibcli-lsa3-samba4.so so:liblibcli-netlogon3-samba4.so so:liblibsmb-samba4.so so:libmscat-samba4.so so:libmsrpc3-samba4.so so:libncursesw.so.6 so:libndr-nbt.so.0 so:libndr-samba-samba4.so so:libndr-samba4.so so:libndr-standard.so.0 so:libndr.so.3 so:libpanelw.so.6 so:libpopt.so.0 so:libregistry-samba4.so so:libreplace-samba4.so so:libsamba-credentials.so.1 so:libsamba-debug-samba4.so so:libsamba-errors.so.1 so:libsamba-hostconfig.so.0 so:libsamba-passdb.so.0 so:libsamba-security-samba4.so so:libsamba-sockets-samba4.so so:libsamba-util.so.0 so:libsamba3-util-samba4.so so:libsamdb-common-samba4.so so:libsecrets3-samba4.so so:libserver-role-samba4.so so:libsmbclient-raw-samba4.so so:libsmbclient.so.0 so:libsmbconf.so.0 so:libsocket-blocking-samba4.so so:libtalloc.so.2 so:libtevent-util.so.0 so:libtevent.so.0 so:libtrusts-util-samba4.so so:libutil-reg-samba4.so so:libutil-tdb-samba4.so
15-
p:cmd:cifsdd=4.19.6-r0 cmd:dbwrap_tool=4.19.6-r0 cmd:dumpmscat=4.19.6-r0 cmd:mdsearch=4.19.6-r0 cmd:mvxattr=4.19.6-r0 cmd:nmblookup=4.19.6-r0 cmd:oLschema2ldif=4.19.6-r0 cmd:regdiff=4.19.6-r0 cmd:regpatch=4.19.6-r0 cmd:regshell=4.19.6-r0 cmd:regtree=4.19.6-r0 cmd:rpcclient=4.19.6-r0 cmd:samba-regedit=4.19.6-r0 cmd:sharesec=4.19.6-r0 cmd:smbcacls=4.19.6-r0 cmd:smbclient=4.19.6-r0 cmd:smbcquotas=4.19.6-r0 cmd:smbget=4.19.6-r0 cmd:smbprint=4.19.6-r0 cmd:smbspool=4.19.6-r0 cmd:smbtar=4.19.6-r0 cmd:smbtree=4.19.6-r0
12+
t:1730298331
13+
c:cfe78cf5f7a0e65f211643c2a5291a349b762c18
14+
D:samba-libs=4.19.9-r0 samba-common=4.19.9-r0 so:libCHARSET3-samba4.so so:libaddns-samba4.so so:libarchive.so.13 so:libc.musl-x86_64.so.1 so:libcli-cldap-samba4.so so:libcli-ldap-samba4.so so:libcli-smb-common-samba4.so so:libcli-spoolss-samba4.so so:libcliauth-samba4.so so:libcmdline-contexts-samba4.so so:libcmdline-samba4.so so:libcom-err-samba4.so so:libdbwrap-samba4.so so:libdcerpc-binding.so.0 so:libdcerpc-samba-samba4.so so:libevents-samba4.so so:libformw.so.6 so:libgenrand-samba4.so so:libgensec-samba4.so so:libgnutls.so.30 so:libkrb5-samba4.so so:libkrb5samba-samba4.so so:libldb.so.2 so:libldbsamba-samba4.so so:liblibcli-lsa3-samba4.so so:liblibcli-netlogon3-samba4.so so:liblibsmb-samba4.so so:libmscat-samba4.so so:libmsrpc3-samba4.so so:libncursesw.so.6 so:libndr-nbt.so.0 so:libndr-samba-samba4.so so:libndr-samba4.so so:libndr-standard.so.0 so:libndr.so.3 so:libpanelw.so.6 so:libpopt.so.0 so:libregistry-samba4.so so:libreplace-samba4.so so:libsamba-credentials.so.1 so:libsamba-debug-samba4.so so:libsamba-errors.so.1 so:libsamba-hostconfig.so.0 so:libsamba-passdb.so.0 so:libsamba-security-samba4.so so:libsamba-sockets-samba4.so so:libsamba-util.so.0 so:libsamba3-util-samba4.so so:libsamdb-common-samba4.so so:libsecrets3-samba4.so so:libserver-role-samba4.so so:libsmbclient-raw-samba4.so so:libsmbclient.so.0 so:libsmbconf.so.0 so:libsocket-blocking-samba4.so so:libtalloc.so.2 so:libtevent-util.so.0 so:libtevent.so.0 so:libtrusts-util-samba4.so so:libutil-reg-samba4.so so:libutil-tdb-samba4.so
15+
p:cmd:cifsdd=4.19.9-r0 cmd:dbwrap_tool=4.19.9-r0 cmd:dumpmscat=4.19.9-r0 cmd:mdsearch=4.19.9-r0 cmd:mvxattr=4.19.9-r0 cmd:nmblookup=4.19.9-r0 cmd:oLschema2ldif=4.19.9-r0 cmd:regdiff=4.19.9-r0 cmd:regpatch=4.19.9-r0 cmd:regshell=4.19.9-r0 cmd:regtree=4.19.9-r0 cmd:rpcclient=4.19.9-r0 cmd:samba-regedit=4.19.9-r0 cmd:sharesec=4.19.9-r0 cmd:smbcacls=4.19.9-r0 cmd:smbclient=4.19.9-r0 cmd:smbcquotas=4.19.9-r0 cmd:smbget=4.19.9-r0 cmd:smbprint=4.19.9-r0 cmd:smbspool=4.19.9-r0 cmd:smbtar=4.19.9-r0 cmd:smbtree=4.19.9-r0
1616

Binary file not shown.

tests/expected/tests/test_alpine.py.test_two/APKINDEX

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ c:fc95c59998285564fbcb0bfb2443898c62e10171
1414
D:gdb so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libncursesw.so.6 so:libreadline.so.8 so:libstdc++.so.6
1515
p:cmd:cgdb=0.8.0-r2
1616

17-
C:Q1TXVgzyQiVmY+lk5/cMY6XdPA4CI=
17+
C:Q1IZdVsEDSxN0qfNVNB4uePz6O/fY=
1818
P:samba-client
19-
V:4.19.6-r0
19+
V:4.19.9-r0
2020
A:x86_64
21-
S:678507
21+
S:678672
2222
I:2490368
2323
T:Samba client programs
2424
U:https://www.samba.org/
2525
L:GPL-3.0-or-later AND LGPL-3.0-or-later
2626
o:samba
2727
m:Natanael Copa <[email protected]>
28-
t:1716198147
29-
c:b4a9e905062153013701be64f4bec53be3cb2008
30-
D:samba-libs=4.19.6-r0 samba-common=4.19.6-r0 so:libCHARSET3-samba4.so so:libaddns-samba4.so so:libarchive.so.13 so:libc.musl-x86_64.so.1 so:libcli-cldap-samba4.so so:libcli-ldap-samba4.so so:libcli-smb-common-samba4.so so:libcli-spoolss-samba4.so so:libcliauth-samba4.so so:libcmdline-contexts-samba4.so so:libcmdline-samba4.so so:libcom-err-samba4.so so:libdbwrap-samba4.so so:libdcerpc-binding.so.0 so:libdcerpc-samba-samba4.so so:libevents-samba4.so so:libformw.so.6 so:libgenrand-samba4.so so:libgensec-samba4.so so:libgnutls.so.30 so:libkrb5-samba4.so so:libkrb5samba-samba4.so so:libldb.so.2 so:libldbsamba-samba4.so so:liblibcli-lsa3-samba4.so so:liblibcli-netlogon3-samba4.so so:liblibsmb-samba4.so so:libmscat-samba4.so so:libmsrpc3-samba4.so so:libncursesw.so.6 so:libndr-nbt.so.0 so:libndr-samba-samba4.so so:libndr-samba4.so so:libndr-standard.so.0 so:libndr.so.3 so:libpanelw.so.6 so:libpopt.so.0 so:libregistry-samba4.so so:libreplace-samba4.so so:libsamba-credentials.so.1 so:libsamba-debug-samba4.so so:libsamba-errors.so.1 so:libsamba-hostconfig.so.0 so:libsamba-passdb.so.0 so:libsamba-security-samba4.so so:libsamba-sockets-samba4.so so:libsamba-util.so.0 so:libsamba3-util-samba4.so so:libsamdb-common-samba4.so so:libsecrets3-samba4.so so:libserver-role-samba4.so so:libsmbclient-raw-samba4.so so:libsmbclient.so.0 so:libsmbconf.so.0 so:libsocket-blocking-samba4.so so:libtalloc.so.2 so:libtevent-util.so.0 so:libtevent.so.0 so:libtrusts-util-samba4.so so:libutil-reg-samba4.so so:libutil-tdb-samba4.so
31-
p:cmd:cifsdd=4.19.6-r0 cmd:dbwrap_tool=4.19.6-r0 cmd:dumpmscat=4.19.6-r0 cmd:mdsearch=4.19.6-r0 cmd:mvxattr=4.19.6-r0 cmd:nmblookup=4.19.6-r0 cmd:oLschema2ldif=4.19.6-r0 cmd:regdiff=4.19.6-r0 cmd:regpatch=4.19.6-r0 cmd:regshell=4.19.6-r0 cmd:regtree=4.19.6-r0 cmd:rpcclient=4.19.6-r0 cmd:samba-regedit=4.19.6-r0 cmd:sharesec=4.19.6-r0 cmd:smbcacls=4.19.6-r0 cmd:smbclient=4.19.6-r0 cmd:smbcquotas=4.19.6-r0 cmd:smbget=4.19.6-r0 cmd:smbprint=4.19.6-r0 cmd:smbspool=4.19.6-r0 cmd:smbtar=4.19.6-r0 cmd:smbtree=4.19.6-r0
28+
t:1730298331
29+
c:cfe78cf5f7a0e65f211643c2a5291a349b762c18
30+
D:samba-libs=4.19.9-r0 samba-common=4.19.9-r0 so:libCHARSET3-samba4.so so:libaddns-samba4.so so:libarchive.so.13 so:libc.musl-x86_64.so.1 so:libcli-cldap-samba4.so so:libcli-ldap-samba4.so so:libcli-smb-common-samba4.so so:libcli-spoolss-samba4.so so:libcliauth-samba4.so so:libcmdline-contexts-samba4.so so:libcmdline-samba4.so so:libcom-err-samba4.so so:libdbwrap-samba4.so so:libdcerpc-binding.so.0 so:libdcerpc-samba-samba4.so so:libevents-samba4.so so:libformw.so.6 so:libgenrand-samba4.so so:libgensec-samba4.so so:libgnutls.so.30 so:libkrb5-samba4.so so:libkrb5samba-samba4.so so:libldb.so.2 so:libldbsamba-samba4.so so:liblibcli-lsa3-samba4.so so:liblibcli-netlogon3-samba4.so so:liblibsmb-samba4.so so:libmscat-samba4.so so:libmsrpc3-samba4.so so:libncursesw.so.6 so:libndr-nbt.so.0 so:libndr-samba-samba4.so so:libndr-samba4.so so:libndr-standard.so.0 so:libndr.so.3 so:libpanelw.so.6 so:libpopt.so.0 so:libregistry-samba4.so so:libreplace-samba4.so so:libsamba-credentials.so.1 so:libsamba-debug-samba4.so so:libsamba-errors.so.1 so:libsamba-hostconfig.so.0 so:libsamba-passdb.so.0 so:libsamba-security-samba4.so so:libsamba-sockets-samba4.so so:libsamba-util.so.0 so:libsamba3-util-samba4.so so:libsamdb-common-samba4.so so:libsecrets3-samba4.so so:libserver-role-samba4.so so:libsmbclient-raw-samba4.so so:libsmbclient.so.0 so:libsmbconf.so.0 so:libsocket-blocking-samba4.so so:libtalloc.so.2 so:libtevent-util.so.0 so:libtevent.so.0 so:libtrusts-util-samba4.so so:libutil-reg-samba4.so so:libutil-tdb-samba4.so
31+
p:cmd:cifsdd=4.19.9-r0 cmd:dbwrap_tool=4.19.9-r0 cmd:dumpmscat=4.19.9-r0 cmd:mdsearch=4.19.9-r0 cmd:mvxattr=4.19.9-r0 cmd:nmblookup=4.19.9-r0 cmd:oLschema2ldif=4.19.9-r0 cmd:regdiff=4.19.9-r0 cmd:regpatch=4.19.9-r0 cmd:regshell=4.19.9-r0 cmd:regtree=4.19.9-r0 cmd:rpcclient=4.19.9-r0 cmd:samba-regedit=4.19.9-r0 cmd:sharesec=4.19.9-r0 cmd:smbcacls=4.19.9-r0 cmd:smbclient=4.19.9-r0 cmd:smbcquotas=4.19.9-r0 cmd:smbget=4.19.9-r0 cmd:smbprint=4.19.9-r0 cmd:smbspool=4.19.9-r0 cmd:smbtar=4.19.9-r0 cmd:smbtree=4.19.9-r0
3232

Binary file not shown.

tests/test_alpine.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@
1616

1717

1818
@pytest.mark.download(
19-
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.6-r0.apk',
19+
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.9-r0.apk',
2020
)
2121
def test_one(binaries_path, output_path, expected_path, pki_signer, fixed_datetime, should_populate):
2222
repo = AlpineRepo('fancy repo')
23-
package = repo.add_package(binaries_path / 'samba-client-4.19.6-r0.apk')
23+
package = repo.add_package(binaries_path / 'samba-client-4.19.9-r0.apk')
2424
assert package.name == 'samba-client'
2525
assert package.arch == 'x86_64'
26-
assert package.version_str == '4.19.6-r0'
27-
assert package.version_key == VersionKey(4, 19, 6, 'r', 0)
28-
assert package.src_path == binaries_path / 'samba-client-4.19.6-r0.apk'
29-
assert package.repo_filename == 'samba-client-4.19.6-r0.apk'
30-
assert package.fields['C'] == 'Q1TXVgzyQiVmY+lk5/cMY6XdPA4CI='
26+
assert package.version_str == '4.19.9-r0'
27+
assert package.version_key == VersionKey(4, 19, 9, 'r', 0)
28+
assert package.src_path == binaries_path / 'samba-client-4.19.9-r0.apk'
29+
assert package.repo_filename == 'samba-client-4.19.9-r0.apk'
30+
assert package.fields['C'] == 'Q1IZdVsEDSxN0qfNVNB4uePz6O/fY='
3131
repo.export(output_path, pki_signer, '[email protected]', fixed_datetime, keep_expanded=True)
32-
compare_files(output_path / 'x86_64/samba-client-4.19.6-r0.apk', binaries_path / 'samba-client-4.19.6-r0.apk')
32+
compare_files(output_path / 'x86_64/samba-client-4.19.9-r0.apk', binaries_path / 'samba-client-4.19.9-r0.apk')
3333
if sys.version_info >= (3, 9):
3434
compare_files(output_path / 'x86_64/APKINDEX.tar.gz', expected_path / 'APKINDEX.tar.gz', should_populate)
3535
compare_files(output_path / 'expanded/DESCRIPTION', expected_path / 'DESCRIPTION', should_populate)
3636
compare_files(output_path / 'expanded/x86_64/APKINDEX', expected_path / 'APKINDEX', should_populate)
3737

3838
@pytest.mark.download(
39-
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.6-r0.apk',
39+
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.9-r0.apk',
4040
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/cgdb-0.8.0-r2.apk'
4141
)
4242
def test_two(binaries_path, output_path, expected_path, pki_signer, fixed_datetime, should_populate):
4343
repo = AlpineRepo('fancy repo')
44-
repo.add_package(binaries_path / 'samba-client-4.19.6-r0.apk')
44+
repo.add_package(binaries_path / 'samba-client-4.19.9-r0.apk')
4545
package = repo.add_package(binaries_path / 'cgdb-0.8.0-r2.apk')
4646
assert package.name == 'cgdb'
4747
assert package.arch == 'x86_64'
@@ -51,31 +51,31 @@ def test_two(binaries_path, output_path, expected_path, pki_signer, fixed_dateti
5151
assert package.repo_filename == 'cgdb-0.8.0-r2.apk'
5252
assert package.fields['C'] == 'Q15n3yDvEce9+/S6laLndWEZsUjfc='
5353
repo.export(output_path, pki_signer, '[email protected]', fixed_datetime, keep_expanded=True)
54-
compare_files(output_path / 'x86_64/samba-client-4.19.6-r0.apk', binaries_path / 'samba-client-4.19.6-r0.apk')
54+
compare_files(output_path / 'x86_64/samba-client-4.19.9-r0.apk', binaries_path / 'samba-client-4.19.9-r0.apk')
5555
compare_files(output_path / 'x86_64/cgdb-0.8.0-r2.apk', binaries_path / 'cgdb-0.8.0-r2.apk')
5656
if sys.version_info >= (3, 9):
5757
compare_files(output_path / 'x86_64/APKINDEX.tar.gz', expected_path / 'APKINDEX.tar.gz', should_populate)
5858
compare_files(output_path / 'expanded/DESCRIPTION', expected_path / 'DESCRIPTION', should_populate)
5959
compare_files(output_path / 'expanded/x86_64/APKINDEX', expected_path / 'APKINDEX', should_populate)
6060

6161
@pytest.mark.download(
62-
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.6-r0.apk',
62+
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.9-r0.apk',
6363
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/cgdb-0.8.0-r2.apk',
6464
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/7zip-23.01-r0.apk'
6565
)
6666
def test_crud(binaries_path):
6767
repo = AlpineRepo('lol')
6868

69-
package = repo.add_package(binaries_path / 'samba-client-4.19.6-r0.apk')
69+
package = repo.add_package(binaries_path / 'samba-client-4.19.9-r0.apk')
7070
repo.del_package(package)
7171
assert [x for x in repo.architectures] == []
7272
repo.del_package(package) # should succeed
73-
package1 = repo.add_package(binaries_path / 'samba-client-4.19.6-r0.apk')
73+
package1 = repo.add_package(binaries_path / 'samba-client-4.19.9-r0.apk')
7474
package2 = repo.add_package(binaries_path / 'cgdb-0.8.0-r2.apk')
7575
repo.del_package(package1)
7676
assert [x for x in repo.packages('x86_64')] == [package2]
7777

78-
package1 = repo.add_package(binaries_path / 'samba-client-4.19.6-r0.apk')
78+
package1 = repo.add_package(binaries_path / 'samba-client-4.19.9-r0.apk')
7979
package3 = repo.add_package(binaries_path / '7zip-23.01-r0.apk')
8080

8181
repo.del_package(package3)
@@ -86,19 +86,19 @@ def test_crud(binaries_path):
8686
assert [x for x in repo.packages('x86_64')] == [package1]
8787

8888
@pytest.mark.download(
89-
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.6-r0.apk',
89+
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/samba-client-4.19.9-r0.apk',
9090
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/cgdb-0.8.0-r2.apk',
9191
'https://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/7zip-23.01-r0.apk'
9292
)
9393
def test_cmd(binaries_path, output_path, pki_cmd):
9494
subprocess.run([sys.executable, '-m', 'repopulator', 'alpine',
9595
'-d', 'myrepo'] + pki_cmd + ['-s', '[email protected]',
96-
'-p', binaries_path / 'samba-client-4.19.6-r0.apk',
96+
'-p', binaries_path / 'samba-client-4.19.9-r0.apk',
9797
binaries_path / 'cgdb-0.8.0-r2.apk',
9898
binaries_path / '7zip-23.01-r0.apk',
9999
'-o', output_path
100100
], check=True)
101-
compare_files(output_path / 'x86_64/samba-client-4.19.6-r0.apk', binaries_path / 'samba-client-4.19.6-r0.apk')
101+
compare_files(output_path / 'x86_64/samba-client-4.19.9-r0.apk', binaries_path / 'samba-client-4.19.9-r0.apk')
102102
compare_files(output_path / 'x86_64/cgdb-0.8.0-r2.apk', binaries_path / 'cgdb-0.8.0-r2.apk')
103103
compare_files(output_path / 'aarch64/7zip-23.01-r0.apk', binaries_path / '7zip-23.01-r0.apk')
104104

0 commit comments

Comments
 (0)