Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3006.x] [code-coverage] Added support for smb testing, and ported smb test from unittest to pytest #65570

Closed
wants to merge 32 commits into from
Closed

[3006.x] [code-coverage] Added support for smb testing, and ported smb test from unittest to pytest #65570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e508c06
Initial port of unittest to pytest for smb testing
Nov 14, 2023
7e935d0
Added support for smb testing, and ported smb test from unittest to p…
Nov 15, 2023
c7cd903
Updated requirements for pyspnego and smbprotocol
Nov 16, 2023
4f904c7
Update per reviewer comments and additional fixes, issues of SMB acce…
Nov 16, 2023
e508cb6
Removed impacket as a requirement for Windows
Nov 16, 2023
0c1d571
Updated requirements per reviewer's comments
Nov 17, 2023
9c36292
Debug alter time from 1 to 5 seconds, to see if this makes difference
Nov 20, 2023
4069864
Picked revised requirements
Dec 1, 2023
d7c547b
Fixed typo, missing f on an f-string
Dec 2, 2023
e5ff05b
Testing requirements for Salt Lint errors with Py 3.8
Dec 4, 2023
6c04dd4
Updated test for Salt Lint error
Dec 4, 2023
cb18d6d
Changed time, but will be surprised if that makes a difference
Dec 5, 2023
ee907bc
Debug code to test smmbd failure
Dec 8, 2023
3f8cd42
More debugging info
Dec 11, 2023
822faa8
Added further debug for smbd
Dec 12, 2023
e1cd458
More debugging
Dec 13, 2023
2e3949d
more debug
Dec 14, 2023
bea459c
more debugging of PR tools VM
Dec 14, 2023
3644353
Further debugging
Jan 4, 2024
d8ee680
More debugging
Jan 4, 2024
096e5a1
Refining debug
Jan 5, 2024
21edfa8
Altered print statement
Jan 5, 2024
207b49a
More debugging
Jan 5, 2024
461116a
More testing
Jan 5, 2024
c78dbb4
more laborate debugging
Jan 5, 2024
bfaffd3
more debugging
Jan 8, 2024
eb3ff2f
Moire debug
Jan 9, 2024
9f699e7
Fix static requirements
s0undt3ch Jan 18, 2024
26dbc75
Run `smbd` as a salt-factories `Daemon`
s0undt3ch Jan 18, 2024
5033b97
Properly parametrize and fix tests
s0undt3ch Jan 18, 2024
5971cce
Get more information about what's going on
s0undt3ch Jan 19, 2024
4cc7ad2
Re-work requirements
Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions requirements/static/ci/cloud.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ netaddr
profitbricks
pypsexec
pywinrm
pyspnego==0.8.0
smbprotocol==1.10.1
3 changes: 3 additions & 0 deletions requirements/static/ci/common.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ genshi>=0.7.3
cheetah3>=3.2.2
mako
wempy
impacket; sys_platform != 'win32'
pyspnego>=0.9.2; sys_platform != 'win32'
smbprotocol>=1.10.1; sys_platform != 'win32'
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
click-default-group==1.2.2
# via towncrier
click==7.1.1
click==8.1.7
# via
# -c requirements/static/ci/py3.10/linux.txt
# click-default-group
Expand Down
51 changes: 46 additions & 5 deletions requirements/static/ci/py3.10/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ bcrypt==4.1.2
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# paramiko
blinker==1.7.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# flask
boto3==1.21.46
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -89,6 +93,7 @@ charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# impacket
# requests
cheetah3==3.2.6.post2
# via
Expand All @@ -105,9 +110,10 @@ cherrypy==18.6.1
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
click==8.1.7
# via
# -c requirements/static/ci/py3.10/linux.txt
# flask
# geomet
clustershell==1.8.3
# via
Expand Down Expand Up @@ -150,11 +156,16 @@ dnspython==1.16.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# ldapdomaindump
# python-etcd
docker==6.1.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
dsinternals==1.2.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# impacket
etcd3-py==0.1.6
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand All @@ -171,6 +182,10 @@ flaky==3.7.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
flask==3.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# impacket
frozenlist==1.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -213,6 +228,10 @@ immutables==0.15
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# contextvars
impacket==0.11.0 ; sys_platform != "win32"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
importlib-metadata==6.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
Expand All @@ -226,6 +245,10 @@ ipaddress==1.0.22
# via
# -c requirements/static/ci/py3.10/linux.txt
# kubernetes
itsdangerous==2.1.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# flask
jaraco.classes==3.2.1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
Expand Down Expand Up @@ -253,6 +276,7 @@ jinja2==3.1.3
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# flask
# junos-eznc
# moto
jmespath==1.0.1
Expand Down Expand Up @@ -287,6 +311,15 @@ kubernetes==3.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
ldap3==2.9.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# impacket
# ldapdomaindump
ldapdomaindump==0.9.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# impacket
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -409,6 +442,8 @@ pyasn1-modules==0.2.4
pyasn1==0.4.8
# via
# -c requirements/static/ci/py3.10/linux.txt
# impacket
# ldap3
# pyasn1-modules
# rsa
pycparser==2.21 ; python_version >= "3.9"
Expand All @@ -423,6 +458,7 @@ pycryptodomex==3.19.1
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/crypto.txt
# impacket
pyfakefs==5.3.1
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand All @@ -442,6 +478,7 @@ pyopenssl==24.0.0
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/pkg/linux.in
# etcd3-py
# impacket
pyparsing==3.0.9
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand All @@ -456,9 +493,10 @@ pyserial==3.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# junos-eznc
pyspnego==0.8.0
pyspnego==0.10.2 ; sys_platform != "win32"
# via
# -r requirements/static/ci/cloud.in
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# smbprotocol
pytest-custom-exit-code==0.3.0
# via
Expand Down Expand Up @@ -621,6 +659,7 @@ six==1.16.0
# etcd3-py
# genshi
# geomet
# impacket
# jsonschema
# junos-eznc
# kazoo
Expand All @@ -638,9 +677,10 @@ six==1.16.0
# vcert
# virtualenv
# websocket-client
smbprotocol==1.10.1
smbprotocol==1.12.0 ; sys_platform != "win32"
# via
# -r requirements/static/ci/cloud.in
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# pypsexec
smmap==4.0.0
# via
Expand Down Expand Up @@ -723,6 +763,7 @@ wempy==0.2.1
werkzeug==3.0.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# flask
# moto
# pytest-httpserver
xmltodict==0.12.0
Expand Down
39 changes: 37 additions & 2 deletions requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ bcrypt==4.1.2
# via
# -r requirements/static/ci/common.in
# paramiko
blinker==1.7.0
# via flask
boto3==1.21.46
# via
# -r requirements/static/ci/common.in
Expand Down Expand Up @@ -66,6 +68,7 @@ cffi==1.14.6
charset-normalizer==3.2.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# impacket
# requests
cheetah3==3.2.6.post2
# via -r requirements/static/ci/common.in
Expand All @@ -78,8 +81,10 @@ cherrypy==18.6.1
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/darwin.txt
# -r requirements/static/ci/common.in
click==7.0
# via geomet
click==8.1.7
# via
# flask
# geomet
clustershell==1.8.1
# via -r requirements/static/ci/common.in
contextvars==2.4
Expand All @@ -96,6 +101,8 @@ cryptography==42.0.5
# moto
# paramiko
# pyopenssl
# pyspnego
# smbprotocol
# trustme
# vcert
distlib==0.3.2
Expand All @@ -108,9 +115,12 @@ distro==1.5.0
dnspython==1.16.0
# via
# -r requirements/static/ci/common.in
# ldapdomaindump
# python-etcd
docker==6.1.3
# via -r requirements/pytest.txt
dsinternals==1.2.4
# via impacket
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
exceptiongroup==1.0.4
Expand All @@ -119,6 +129,8 @@ filelock==3.0.12
# via virtualenv
flaky==3.7.0
# via -r requirements/pytest.txt
flask==3.0.0
# via impacket
frozenlist==1.3.0
# via
# aiohttp
Expand Down Expand Up @@ -154,6 +166,8 @@ immutables==0.15
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# contextvars
impacket==0.11.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
importlib-metadata==6.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
Expand All @@ -162,6 +176,8 @@ iniconfig==1.0.1
# via pytest
ipaddress==1.0.22
# via kubernetes
itsdangerous==2.1.2
# via flask
jaraco.classes==3.2.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
Expand All @@ -184,6 +200,7 @@ jinja2==3.1.3
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# flask
# junos-eznc
# moto
jmespath==1.0.1
Expand All @@ -203,6 +220,12 @@ keyring==5.7.1
# via -r requirements/static/ci/common.in
kubernetes==3.0.0
# via -r requirements/static/ci/common.in
ldap3==2.9.1
# via
# impacket
# ldapdomaindump
ldapdomaindump==0.9.4
# via impacket
linode-python==1.1.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
Expand Down Expand Up @@ -292,6 +315,8 @@ pyasn1==0.4.8
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/darwin.txt
# impacket
# ldap3
# pyasn1-modules
# rsa
pycparser==2.21 ; python_version >= "3.9"
Expand All @@ -304,6 +329,7 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/crypto.txt
# impacket
pyfakefs==5.3.1
# via -r requirements/pytest.txt
pygit2==1.13.1
Expand All @@ -317,12 +343,17 @@ pyopenssl==24.0.0
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/darwin.txt
# etcd3-py
# impacket
pyparsing==3.0.9
# via junos-eznc
pyrsistent==0.17.3
# via jsonschema
pyserial==3.4
# via junos-eznc
pyspnego==0.10.2 ; sys_platform != "win32"
# via
# -r requirements/static/ci/common.in
# smbprotocol
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
Expand Down Expand Up @@ -433,6 +464,7 @@ six==1.16.0
# etcd3-py
# genshi
# geomet
# impacket
# jsonschema
# junos-eznc
# kubernetes
Expand All @@ -445,6 +477,8 @@ six==1.16.0
# vcert
# virtualenv
# websocket-client
smbprotocol==1.12.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
smmap==4.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
Expand Down Expand Up @@ -503,6 +537,7 @@ wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.1
# via
# flask
# moto
# pytest-httpserver
xmltodict==0.12.0
Expand Down
Loading
Loading