valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2017.7.9' into test_fix_bp

Browse Source
This commit is contained in:
Daniel Wozniak 2019-04-20 01:44:24 -07:00 committed by GitHub
commit ec4a278bd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/static/cloud.in
View File

@ -1,7 +1,7 @@
# This is a compilation of requirements installed on salt-jenkins git.salt state run
azure
impacket
impacket; python_version < '3.0'
netaddr
profitbricks
pywinrm

2
requirements/static/py2.7/cloud.txt
View File

@ -100,7 +100,7 @@ flask==1.0.2 # via impacket
future==0.17.1 # via ldapdomaindump
futures==3.2.0 # via azure-cosmosdb-table, azure-datalake-store, azure-storage-blob, azure-storage-file
idna==2.8 # via requests
impacket==0.9.19
impacket==0.9.19 ; python_version < "3.0"
ipaddress==1.0.22 # via cryptography
isodate==0.6.0 # via msrest
itsdangerous==1.1.0 # via flask

18
requirements/static/py3.4/cloud.txt
View File

@ -91,37 +91,23 @@ azure==4.0.0
certifi==2019.3.9 # via msrest, requests
cffi==1.12.2 # via azure-datalake-store, cryptography
chardet==3.0.4 # via requests
click==7.0 # via flask
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, pyopenssl, requests-ntlm
dnspython==1.16.0 # via ldapdomaindump
flask==1.0.2 # via impacket
future==0.17.1 # via ldapdomaindump
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, requests-ntlm
idna==2.8 # via requests
impacket==0.9.19
isodate==0.6.0 # via msrest
itsdangerous==1.1.0 # via flask
jinja2==2.10.1 # via flask
ldap3==2.5.1 # via impacket, ldapdomaindump
ldapdomaindump==0.9.1 # via impacket
markupsafe==1.1.1 # via jinja2
msrest==0.6.6 # via azure-applicationinsights, azure-eventgrid, azure-keyvault, azure-loganalytics, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-eventhub, azure-mgmt-keyvault, azure-mgmt-media, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-servicefabric, msrestazure
msrestazure==0.6.0 # via azure-batch, azure-eventgrid, azure-graphrbac, azure-keyvault, azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-analytics, azure-mgmt-datalake-store, azure-mgmt-datamigration, azure-mgmt-devspaces, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iotcentral, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementgroups, azure-mgmt-managementpartner, azure-mgmt-maps, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-policyinsights, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web
netaddr==0.7.19
ntlm-auth==1.3.0 # via requests-ntlm
oauthlib==3.0.1 # via requests-oauthlib
profitbricks==4.1.3
pyasn1==0.4.5 # via impacket, ldap3
pycparser==2.19 # via cffi
pycryptodomex==3.8.1 # via impacket
pyjwt==1.7.1 # via adal
pyopenssl==19.0.0 # via impacket
python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common
pywinrm==0.3.0
requests-ntlm==1.1.0 # via pywinrm
requests-oauthlib==1.2.0 # via msrest
requests==2.21.0 # via adal, azure-cosmosdb-table, azure-datalake-store, azure-keyvault, azure-servicebus, azure-servicemanagement-legacy, azure-storage-common, msrest, profitbricks, pywinrm, requests-ntlm, requests-oauthlib
six==1.12.0 # via cryptography, impacket, isodate, profitbricks, pyopenssl, python-dateutil, pywinrm
six==1.12.0 # via cryptography, isodate, profitbricks, python-dateutil, pywinrm
typing==3.6.6 # via msrest
urllib3==1.24.2 # via requests
werkzeug==0.15.2 # via flask
xmltodict==0.12.0 # via pywinrm

18
requirements/static/py3.5/cloud.txt
View File

@ -91,36 +91,22 @@ azure==4.0.0
certifi==2019.3.9 # via msrest, requests
cffi==1.12.2 # via azure-datalake-store, cryptography
chardet==3.0.4 # via requests
click==7.0 # via flask
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, pyopenssl, requests-ntlm
dnspython==1.16.0 # via ldapdomaindump
flask==1.0.2 # via impacket
future==0.17.1 # via ldapdomaindump
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, requests-ntlm
idna==2.8 # via requests
impacket==0.9.19
isodate==0.6.0 # via msrest
itsdangerous==1.1.0 # via flask
jinja2==2.10.1 # via flask
ldap3==2.5.1 # via impacket, ldapdomaindump
ldapdomaindump==0.9.1 # via impacket
markupsafe==1.1.1 # via jinja2
msrest==0.6.6 # via azure-applicationinsights, azure-eventgrid, azure-keyvault, azure-loganalytics, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-eventhub, azure-mgmt-keyvault, azure-mgmt-media, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-servicefabric, msrestazure
msrestazure==0.6.0 # via azure-batch, azure-eventgrid, azure-graphrbac, azure-keyvault, azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-analytics, azure-mgmt-datalake-store, azure-mgmt-datamigration, azure-mgmt-devspaces, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iotcentral, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementgroups, azure-mgmt-managementpartner, azure-mgmt-maps, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-policyinsights, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web
netaddr==0.7.19
ntlm-auth==1.3.0 # via requests-ntlm
oauthlib==3.0.1 # via requests-oauthlib
profitbricks==4.1.3
pyasn1==0.4.5 # via impacket, ldap3
pycparser==2.19 # via cffi
pycryptodomex==3.8.1 # via impacket
pyjwt==1.7.1 # via adal
pyopenssl==19.0.0 # via impacket
python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common
pywinrm==0.3.0
requests-ntlm==1.1.0 # via pywinrm
requests-oauthlib==1.2.0 # via msrest
requests==2.21.0 # via adal, azure-cosmosdb-table, azure-datalake-store, azure-keyvault, azure-servicebus, azure-servicemanagement-legacy, azure-storage-common, msrest, profitbricks, pywinrm, requests-ntlm, requests-oauthlib
six==1.12.0 # via cryptography, impacket, isodate, profitbricks, pyopenssl, python-dateutil, pywinrm
six==1.12.0 # via cryptography, isodate, profitbricks, python-dateutil, pywinrm
urllib3==1.24.2 # via requests
werkzeug==0.15.2 # via flask
xmltodict==0.12.0 # via pywinrm

18
requirements/static/py3.6/cloud.txt
View File

@ -91,36 +91,22 @@ azure==4.0.0
certifi==2019.3.9 # via msrest, requests
cffi==1.12.2 # via azure-datalake-store, cryptography
chardet==3.0.4 # via requests
click==7.0 # via flask
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, pyopenssl, requests-ntlm
dnspython==1.16.0 # via ldapdomaindump
flask==1.0.2 # via impacket
future==0.17.1 # via ldapdomaindump
cryptography==2.6.1 # via adal, azure-cosmosdb-table, azure-keyvault, azure-storage-common, requests-ntlm
idna==2.8 # via requests
impacket==0.9.19
isodate==0.6.0 # via msrest
itsdangerous==1.1.0 # via flask
jinja2==2.10.1 # via flask
ldap3==2.5.1 # via impacket, ldapdomaindump
ldapdomaindump==0.9.1 # via impacket
markupsafe==1.1.1 # via jinja2
msrest==0.6.6 # via azure-applicationinsights, azure-eventgrid, azure-keyvault, azure-loganalytics, azure-mgmt-cdn, azure-mgmt-compute, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-dns, azure-mgmt-eventhub, azure-mgmt-keyvault, azure-mgmt-media, azure-mgmt-network, azure-mgmt-rdbms, azure-mgmt-resource, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-servicefabric, msrestazure
msrestazure==0.6.0 # via azure-batch, azure-eventgrid, azure-graphrbac, azure-keyvault, azure-mgmt-advisor, azure-mgmt-applicationinsights, azure-mgmt-authorization, azure-mgmt-batch, azure-mgmt-batchai, azure-mgmt-billing, azure-mgmt-cdn, azure-mgmt-cognitiveservices, azure-mgmt-commerce, azure-mgmt-compute, azure-mgmt-consumption, azure-mgmt-containerinstance, azure-mgmt-containerregistry, azure-mgmt-containerservice, azure-mgmt-cosmosdb, azure-mgmt-datafactory, azure-mgmt-datalake-analytics, azure-mgmt-datalake-store, azure-mgmt-datamigration, azure-mgmt-devspaces, azure-mgmt-devtestlabs, azure-mgmt-dns, azure-mgmt-eventgrid, azure-mgmt-eventhub, azure-mgmt-hanaonazure, azure-mgmt-iotcentral, azure-mgmt-iothub, azure-mgmt-iothubprovisioningservices, azure-mgmt-keyvault, azure-mgmt-loganalytics, azure-mgmt-logic, azure-mgmt-machinelearningcompute, azure-mgmt-managementgroups, azure-mgmt-managementpartner, azure-mgmt-maps, azure-mgmt-marketplaceordering, azure-mgmt-media, azure-mgmt-monitor, azure-mgmt-msi, azure-mgmt-network, azure-mgmt-notificationhubs, azure-mgmt-policyinsights, azure-mgmt-powerbiembedded, azure-mgmt-rdbms, azure-mgmt-recoveryservices, azure-mgmt-recoveryservicesbackup, azure-mgmt-redis, azure-mgmt-relay, azure-mgmt-reservations, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-search, azure-mgmt-servicebus, azure-mgmt-servicefabric, azure-mgmt-signalr, azure-mgmt-sql, azure-mgmt-storage, azure-mgmt-subscription, azure-mgmt-trafficmanager, azure-mgmt-web
netaddr==0.7.19
ntlm-auth==1.3.0 # via requests-ntlm
oauthlib==3.0.1 # via requests-oauthlib
profitbricks==4.1.3
pyasn1==0.4.5 # via impacket, ldap3
pycparser==2.19 # via cffi
pycryptodomex==3.8.1 # via impacket
pyjwt==1.7.1 # via adal
pyopenssl==19.0.0 # via impacket
python-dateutil==2.8.0 # via adal, azure-cosmosdb-table, azure-storage-common
pywinrm==0.3.0
requests-ntlm==1.1.0 # via pywinrm
requests-oauthlib==1.2.0 # via msrest
requests==2.21.0 # via adal, azure-cosmosdb-table, azure-datalake-store, azure-keyvault, azure-servicebus, azure-servicemanagement-legacy, azure-storage-common, msrest, profitbricks, pywinrm, requests-ntlm, requests-oauthlib
six==1.12.0 # via cryptography, impacket, isodate, profitbricks, pyopenssl, python-dateutil, pywinrm
six==1.12.0 # via cryptography, isodate, profitbricks, python-dateutil, pywinrm
urllib3==1.24.2 # via requests
werkzeug==0.15.2 # via flask
xmltodict==0.12.0 # via pywinrm

8
tests/integration/__init__.py
View File

@ -203,6 +203,8 @@ class TestDaemon(object):
# Set up PATH to mockbin
self._enter_mockbin()
self.minion_targets = set(['minion', 'sub_minion'])
if self.parser.options.transport == 'zeromq':
self.start_zeromq_daemons()
elif self.parser.options.transport == 'raet':
@ -210,7 +212,6 @@ class TestDaemon(object):
elif self.parser.options.transport == 'tcp':
self.start_tcp_daemons()
self.minion_targets = set(['minion', 'sub_minion'])
self.pre_setup_minions()
self.setup_minions()
@ -457,6 +458,7 @@ class TestDaemon(object):
sys.stdout.flush()
if self.parser.options.proxy:
self.minion_targets.add(self.proxy_opts['id'])
try:
sys.stdout.write(
' * {LIGHT_YELLOW}Starting salt-proxy ... {ENDC}'.format(**self.colors)
@ -464,7 +466,7 @@ class TestDaemon(object):
sys.stdout.flush()
self.proxy_process = start_daemon(
daemon_name='salt-proxy',
daemon_id=self.master_opts['id'],
daemon_id=self.proxy_opts['id'],
daemon_log_prefix='salt-proxy/{}'.format(self.proxy_opts['id']),
daemon_cli_script_name='proxy',
daemon_config=self.proxy_opts,
@ -1378,7 +1380,7 @@ class TestDaemon(object):
ret = None
if ret and 'minions' not in ret:
continue
if ret and sorted(ret['minions']) == ['minion', 'sub_minion']:
if ret and sorted(ret['minions']) == sorted(self.minion_targets):
break
if time.time() - start >= timeout:
raise RuntimeError("Ping Minions Failed")