diff --git a/.zuul.yaml b/.zuul.yaml index 5d8688779..87c43ce55 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -22,6 +22,7 @@ - job: name: murano-rally-task + voting: false parent: rally-task-murano irrelevant-files: &murano-irrelevant-files - ^(test-|)requirements.txt$ diff --git a/lower-constraints.txt b/lower-constraints.txt index a177be141..4ceaa96fb 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -9,13 +9,13 @@ bandit==1.1.0 cachetools==2.0.1 castellan==0.18.0 certifi==2018.1.18 -cffi==1.11.5 +cffi==1.14.0 chardet==3.0.4 cliff==2.11.0 cmd2==0.8.1 contextlib2==0.5.5 coverage==4.0 -cryptography==2.1 +cryptography==2.7 debtcollector==1.2.0 decorator==4.2.1 deprecation==2.0 @@ -23,7 +23,7 @@ docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 enum-compat==0.0.2 -eventlet==0.18.2 +eventlet==0.26.0 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 @@ -32,7 +32,7 @@ future==0.16.0 futurist==1.6.0 gitdb2==2.0.3 GitPython==2.1.8 -greenlet==0.4.13 +greenlet==0.4.15 hacking==0.12.0 idna==2.6 imagesize==1.0.0 @@ -44,11 +44,11 @@ jsonpointer==2.0 jsonschema==3.2.0 keystoneauth1==3.4.0 keystonemiddleware==4.17.0 -kombu==4.0.0 +kombu==4.6.1 linecache2==1.0.0 logilab-common==1.4.1 Mako==1.0.7 -MarkupSafe==1.0 +MarkupSafe==1.1.1 mccabe==0.2.1 mock==2.0.0 monotonic==1.4 @@ -69,7 +69,7 @@ oslo.cache==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.context==2.19.2 -oslo.db==4.27.0 +oslo.db==4.44.0 oslo.i18n==3.15.3 oslo.log==3.36.0 oslo.messaging==5.29.0 @@ -89,19 +89,20 @@ pika==0.10.0 ply==3.11 prettytable==0.7.2 psutil==3.2.2 -psycopg2==2.7.0 +psycopg2==2.8.5 pycadf==2.7.0 -pycodestyle==2.0.0 +pycodestyle==2.5.0 pycparser==2.18 pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 pylint==1.4.5 -PyMySQL==0.7.6 +PyMySQL==0.8.0 pyOpenSSL==17.5.0 pyparsing==2.2.0 pyperclip==1.6.0 python-barbicanclient==4.6.0 +python-congressclient==1.9.0 python-dateutil==2.7.0 python-editor==1.0.3 python-glanceclient==2.9.1 @@ -114,7 +115,7 @@ python-neutronclient==6.7.0 python-subunit==1.2.0 python-swiftclient==3.5.0 pytz==2018.3 -PyYAML==3.12 +PyYAML==3.13 repoze.lru==0.7 requests==2.14.2 requestsexceptions==1.4.0 @@ -131,7 +132,7 @@ statsd==3.2.2 stestr==2.0.0 stevedore==1.20.0 Tempita==0.5.2 -tenacity==4.4.0 +tenacity==4.12.0 testrepository==0.0.18 testresources==2.0.0 testscenarios==0.4 diff --git a/murano/tests/unit/common/test_wsgi.py b/murano/tests/unit/common/test_wsgi.py index bf0d6ccfe..7dddb1930 100644 --- a/murano/tests/unit/common/test_wsgi.py +++ b/murano/tests/unit/common/test_wsgi.py @@ -373,8 +373,9 @@ class TestXMLDictSerializer(base.MuranoTestCase): xml_doc = minidom.Document() links = [{"rel": "rel", "href": "href", "type": "type"}] link_nodes = self.serializer._create_link_nodes(xml_doc, links) - self.assertEqual('', - link_nodes[0].toxml()) + result = link_nodes[0].toxml() + for item in ['=2.3.4 # BSD SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT stevedore>=1.20.0 # Apache-2.0 alembic>=0.8.10 # MIT -eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT +eventlet>=0.26.0 # MIT PasteDeploy>=1.5.0 # MIT Routes>=2.3.1 # MIT -tenacity>=4.4.0 # Apache-2.0 +tenacity>=4.12.0 # Apache-2.0 WebOb>=1.7.1 # MIT -kombu!=4.0.2,>=4.0.0 # BSD +kombu>=4.6.1 # BSD psutil>=3.2.2 # BSD netaddr>=0.7.18 # BSD -PyYAML>=3.12 # MIT +PyYAML>=3.13 # MIT jsonpatch!=1.20,>=1.16 # BSD keystoneauth1>=3.4.0 # Apache-2.0 keystonemiddleware>=4.17.0 # Apache-2.0 testtools>=2.2.0 # MIT yaql>=1.1.3 # Apache 2.0 License debtcollector>=1.2.0 # Apache-2.0 -cryptography>=2.1 # BSD/Apache-2.0 +cryptography>=2.7 # BSD/Apache-2.0 # For paste.util.template used in keystone.common.template Paste>=2.0.2 # MIT @@ -32,7 +32,7 @@ python-heatclient>=1.10.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 python-muranoclient>=0.8.2 # Apache-2.0 python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0 -oslo.db>=4.27.0 # Apache-2.0 +oslo.db>=4.44.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 75aae95a1..c5a2e29ff 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,12 +12,12 @@ testrepository>=0.0.18 # Apache-2.0/BSD testresources>=2.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD pylint==1.4.5 # GPLv2 -pycodestyle>=2.0.0 # MIT License +pycodestyle>=2.5.0 # MIT License requests>=2.14.2 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 murano-pkg-check>=0.3.0 # Apache-2.0 bandit>=1.1.0,!=1.6.0 # Apache-2.0 # Some of the tests use real MySQL and Postgres databases -PyMySQL>=0.7.6 # MIT License -psycopg2>=2.7.0 # LGPL/ZPL +PyMySQL>=0.8.0 # MIT License +psycopg2>=2.8.5 # LGPL/ZPL diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 4eb14cd97..b112326fb 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " DELETE FROM mysql.user WHERE User=''; FLUSH PRIVILEGES; - GRANT ALL PRIVILEGES ON *.* - TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;" + CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW'; + GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;" # Now create our database. mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "