Browse Source

Fix lower-constraints job

Change-Id: I672d275490c9098f9f8835658921002416609da1
changes/83/784883/6
zhurong 2 weeks ago
parent
commit
89b4512e0d
4 changed files with 158 additions and 70 deletions
  1. +136
    -48
      lower-constraints.txt
  2. +8
    -8
      muranoagent/tests/unit/test_files_manager.py
  3. +10
    -10
      requirements.txt
  4. +4
    -4
      test-requirements.txt

+ 136
- 48
lower-constraints.txt View File

@ -1,79 +1,167 @@
alabaster==0.7.10
amqp==2.2.2
alembic==0.9.8
amqp==2.5.0
anyjson==0.3.3
appdirs==1.4.3
asn1crypto==0.24.0
Babel==2.5.3
certifi==2018.1.18
attrs==17.4.0
automaton==1.14.0
bandit==1.1.0
cachetools==2.0.1
castellan==0.16.0
cffi==1.14.0
chardet==3.0.4
coverage==4.5.1
cryptography==2.1.4
cliff==2.11.0
cmd2==0.8.1
colorama==0.3.9
coverage==4.0
cryptography==2.7
cursive==0.2.1
dataclasses==0.7
ddt==1.2.1
debtcollector==1.19.0
docutils==0.14
dulwich==0.19.0
decorator==4.1.0
deprecation==2.0
dogpile.cache==0.6.5
enum-compat==0.0.2
eventlet==0.20.0
eventlet==0.30.1
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
future==0.16.0
futurist==1.8.0
gabbi==1.35.0
gitdb2==2.0.3
GitPython==3.0.5
greenlet==0.4.13
hacking==0.12.0
greenlet==0.4.15
idna==2.6
imagesize==1.0.0
iso8601==0.1.12
iso8601==0.1.11
Jinja2==2.10
keystoneauth1==3.4.0
kombu==4.3.0
jmespath==0.9.3
jsonpatch==1.21
jsonpath-rw==1.4.0
jsonpath-rw-ext==1.1.3
jsonpointer==2.0
jsonschema==3.2.0
keystoneauth1==3.16.0
keystonemiddleware==4.20.0
kombu==4.6.1
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
monotonic==1.4
mox3==0.25.0
msgpack==0.5.6
netaddr==0.7.19
netifaces==0.10.6
lxml==4.5.0
Mako==1.0.7
MarkupSafe==1.1.1
microversion-parse==0.2.1
mock==3.0.0
msgpack==0.6.0
msgpack-python==0.5.6
munch==2.2.0
mypy==0.761
netaddr==0.7.18
netifaces==0.10.4
networkx==2.1.0
numpy==1.19.0
openstacksdk==0.35.0
os-brick==4.3.1
os-client-config==1.29.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.20.0
oslo.i18n==3.20.0
oslo.log==3.37.0
oslo.serialization==2.25.0
oslo.service==1.30.0
oslo.utils==3.36.0
oslotest==3.3.0
Paste==2.0.3
PasteDeploy==1.5.2
pbr==3.1.1
pep8==1.5.7
os-resource-classes==0.4.0
os-service-types==1.7.0
os-traits==2.5.0
os-vif==1.14.0
os-win==5.4.0
os-xenapi==0.3.4
osc-lib==1.10.0
oslo.cache==1.26.0
oslo.concurrency==4.4.0
oslo.config==6.8.0
oslo.context==3.1.1
oslo.db==4.44.0
oslo.i18n==5.0.1
oslo.log==4.4.0
oslo.messaging==10.3.0
oslo.middleware==3.31.0
oslo.policy==3.6.0
oslo.privsep==2.4.0
oslo.reports==1.18.0
oslo.rootwrap==5.8.0
oslo.serialization==4.1.0
oslo.service==2.5.0
oslo.upgradecheck==1.3.0
oslo.utils==4.8.0
oslo.versionedobjects==1.35.0
oslo.vmware==2.17.0
oslotest==3.8.0
osprofiler==1.4.0
ovs==2.10.0
ovsdbapp==0.15.0
packaging==20.4
paramiko==2.7.1
Paste==2.0.2
PasteDeploy==1.5.0
pbr==5.5.1
pluggy==0.6.0
ply==3.11
prettytable==0.7.1
psutil==3.2.2
psycopg2-binary==2.8
py==1.5.2
pyasn1==0.4.2
pyasn1-modules==0.2.1
pycadf==2.7.0
pycparser==2.18
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
pyroute2==0.5.4
PyJWT==1.7.0
PyMySQL==0.8.0
pyOpenSSL==17.5.0
pyparsing==2.2.0
pyperclip==1.6.0
pypowervm==1.1.15
pytest==3.4.2
python-barbicanclient==4.5.2
python-cinderclient==3.3.0
python-dateutil==2.7.0
python-editor==1.0.3
python-glanceclient==2.8.0
python-ironicclient==3.0.0
python-keystoneclient==3.15.0
python-mimeparse==1.6.0
python-subunit==1.2.0
python-neutronclient==6.7.0
python-subunit==1.4.0
pytz==2018.3
PyYAML==3.13
PyYAML==5.1
repoze.lru==0.7
requests==2.18.4
requests==2.25.1
requests-mock==1.2.0
requestsexceptions==1.4.0
rfc3986==1.1.0
Routes==2.4.1
retrying==1.3.3
rfc3986==1.2.0
Routes==2.3.1
semantic-version==2.6.0
simplejson==3.13.2
six==1.15.0
smmap2==2.0.3
snowballstemmer==1.2.1
stevedore==1.28.0
sortedcontainers==2.1.0
SQLAlchemy==1.2.19
sqlalchemy-migrate==0.13.0
sqlparse==0.2.4
statsd==3.2.2
stestr==2.0.0
testtools==2.3.0
stevedore==1.20.0
suds-jurko==0.6
taskflow==3.8.0
Tempita==0.5.2
tenacity==6.3.1
testrepository==0.0.20
testresources==2.0.0
testscenarios==0.4
testtools==2.2.0
tooz==1.58.0
traceback2==1.4.0
unittest2==1.1.0
urllib3==1.22
vine==1.1.4
WebOb==1.7.4
voluptuous==0.11.1
warlock==1.3.1
WebOb==1.8.2
websockify==0.9.0
wrapt==1.10.11
wsgi-intercept==1.7.0
zVMCloudConnector==1.3.0

+ 8
- 8
muranoagent/tests/unit/test_files_manager.py View File

@ -36,19 +36,19 @@ class TestFileManager(base.MuranoAgentTestCase):
CONF.set_override('storage', 'cache')
def test_is_svn(self):
files = files_manager.FilesManager(self.get_template_downloable())
files = files_manager.FilesManager(self.get_template_downloable(1))
self.assertTrue(files._is_svn_repository("https://sdfa/svn/ss"))
def test_is_svn_first(self):
files = files_manager.FilesManager(self.get_template_downloable())
files = files_manager.FilesManager(self.get_template_downloable(2))
self.assertTrue(files._is_svn_repository("svn://test"))
def test_is_svn_wrong_http_protocol(self):
files = files_manager.FilesManager(self.get_template_downloable())
files = files_manager.FilesManager(self.get_template_downloable(3))
self.assertFalse(files._is_svn_repository("httpp://sdfa/svn/ss"))
def test_is_svn_wrong_svn_slash(self):
files = files_manager.FilesManager(self.get_template_downloable())
files = files_manager.FilesManager(self.get_template_downloable(4))
self.assertFalse(files._is_svn_repository("svn:sdfa/svn/ss"))
@mock.patch("git.Git")
@ -63,7 +63,7 @@ class TestFileManager(base.MuranoAgentTestCase):
mock_path.return_value = True
mock_git.clone.return_value = None
template = self.get_template_downloable_git()
files = files_manager.FilesManager(self.get_template_downloable())
files = files_manager.FilesManager(self.get_template_downloable(5))
files._download_url_file(template.Files['mycoockbook'], "script")
@mock.patch('os.path.isdir')
@ -83,8 +83,8 @@ class TestFileManager(base.MuranoAgentTestCase):
mock_requests.return_value = None
self._open_mock(open_mock)
template = self.get_template_downloable()
files = files_manager.FilesManager(self.get_template_downloable())
template = self.get_template_downloable(6)
files = files_manager.FilesManager(self.get_template_downloable(6))
files._download_url_file(template.Files['file'], "script")
@mock.patch('subprocess.Popen')
@ -173,7 +173,7 @@ class TestFileManager(base.MuranoAgentTestCase):
}
)
def get_template_downloable(self):
def get_template_downloable(self, file_id):
return bunch.Bunch(
ID='ID',
Files={


+ 10
- 10
requirements.txt View File

@ -1,16 +1,16 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=3.1.1 # Apache-2.0
pbr>=5.5.1 # Apache-2.0
anyjson>=0.3.3 # BSD
eventlet>=0.20.0,!=0.20.1,!=0.21.0 # MIT
eventlet>=0.30.1 # MIT
GitPython>=3.0.5 # BSD License (3 clause)
kombu>=4.3.0 # BSD
oslo.config>=5.2.0 # Apache-2.0
oslo.log>=3.37.0 # Apache-2.0
oslo.service>=1.30.0 # Apache-2.0
oslo.utils>=3.36.0 # Apache-2.0
PyYAML>=3.13 # MIT
kombu>=4.6.1 # BSD
oslo.config>=6.8.0 # Apache-2.0
oslo.log>=4.4.0 # Apache-2.0
oslo.service>=2.5.0 # Apache-2.0
oslo.utils>=4.8.0 # Apache-2.0
PyYAML>=5.1 # MIT
semantic-version>=2.6.0 # BSD
requests>=2.18.4 # Apache-2.0
cryptography>=2.1.4 # BSD/Apache-2.0
requests>=2.25.1 # Apache-2.0
cryptography>=2.7 # BSD/Apache-2.0

+ 4
- 4
test-requirements.txt View File

@ -1,9 +1,9 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=3.0.1,<3.1.0 # Apache-2.0
hacking>=3.1.0,<3.2.0 # Apache-2.0
unittest2>=1.1.0 # BSD
coverage>=4.5.1 # Apache-2.0
testtools>=2.3.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
testtools>=2.2.0 # MIT
stestr>=2.0.0 # Apache-2.0
oslotest>=3.3.0 # Apache-2.0
oslotest>=3.8.0 # Apache-2.0

Loading…
Cancel
Save