diff --git a/.zuul.yaml b/.zuul.yaml index 09cb33d80..033a7f2b3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -152,7 +152,6 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 223383722..000000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,164 +0,0 @@ -alabaster==0.7.10 -alembic==0.8.10 -amqp==2.2.2 -anyjson==0.3.3 -appdirs==1.4.3 -asn1crypto==0.24.0 -Babel==2.3.4 -bcrypt==3.1.4 -beautifulsoup4==4.6.0 -cachetools==2.0.1 -castellan==0.16.0 -certifi==2018.1.18 -cffi==1.11.5 -chardet==3.0.4 -cliff==2.11.0 -cmd2==0.8.2 -contextlib2==0.5.5 -coverage==4.0 -cryptography==2.1 -ddt===1.0.1 -debtcollector==1.19.0 -decorator==4.4.1 -deprecation==2.0 -doc8==0.6.0 -docutils==0.14 -dogpile.cache==0.6.5 -dulwich==0.19.0 -enum-compat==0.0.2 -eventlet==0.22.0 -extras==1.0.0 -fasteners==0.14.1 -fixtures==3.0.0 -future==0.16.0 -futurist==1.6.0 -glance-store==0.26.1 -google-auth==1.4.1 -greenlet==0.4.13 -heat-translator==2.0.0 -idna==2.6 -imagesize==1.0.0 -ipaddress==1.0.19 -iso8601==0.1.12 -Jinja2==2.10 -jmespath==0.9.3 -jsonpatch==1.21 -jsonpointer==2.0 -jsonschema==3.0.0 -keystoneauth1==3.15.0 -keystonemiddleware==4.17.0 -kombu==4.0.0 -kubernetes==5.0.0 -linecache2==1.0.0 -Mako==1.0.7 -MarkupSafe==1.0 -mccabe==0.2.1 -mock==3.0.0 -monotonic==1.4 -mox3==0.25.0 -msgpack==0.5.6 -munch==2.2.0 -netaddr==0.7.18 -netifaces==0.10.6 -oauthlib==2.0.7 -openstackdocstheme==1.20.0 -openstacksdk==0.44.0 -os-api-ref==1.5.0 -os-client-config==1.29.0 -os-service-types==1.7.0 -osc-lib==1.10.0 -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.i18n==3.20.0 -oslo.log==3.36.0 -oslo.messaging==9.3.0 -oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.reports==1.18.0 -oslo.rootwrap==5.8.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.upgradecheck==0.1.0 -oslo.utils==3.33.0 -oslo.versionedobjects==1.33.3 -oslotest==3.2.0 -packaging==17.1 -paramiko==2.0.0 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 -pkg-resources==0.0.0 -prettytable==0.7.2 -psutil==5.4.3 -pyasn1-modules==0.2.1 -pyasn1==0.4.2 -pycadf==2.7.0 -pycparser==2.18 -Pygments==2.2.0 -pyinotify==0.9.6 -PyNaCl==1.2.1 -pyOpenSSL==17.5.0 -pyparsing==2.2.0 -pyperclip==1.6.0 -pyroute2==0.4.21 -python-barbicanclient==4.5.2 -python-blazarclient==1.0.1 -python-dateutil==2.7.2 -python-editor==1.0.3 -python-glanceclient==2.9.1 -python-heatclient==1.10.0 -python-keystoneclient==3.8.0 -python-mimeparse==1.6.0 -python-mistralclient==3.1.0 -python-neutronclient==6.7.0 -python-novaclient==9.1.0 -python-subunit==1.0.0 -python-swiftclient==3.5.0 -python-tackerclient==0.8.0 -pytz==2018.3 -PyYAML==3.12 -reno==2.7.0 -repoze.lru==0.7 -requests-oauthlib==0.8.0 -requests==2.14.2 -requests-mock==1.2.0 -requestsexceptions==1.4.0 -restructuredtext-lint==1.1.3 -rfc3986==1.1.0 -Routes==2.3.1 -rsa==3.4.2 -setuptools==21.0.0 -simplejson==3.13.2 -six==1.10.0 -snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 -sqlalchemy-filters==0.10.0 -sqlalchemy-migrate==0.11.0 -SQLAlchemy==1.3.0 -sqlparse==0.2.4 -statsd==3.2.2 -stestr==2.0.0 -stevedore==1.20.0 -tempest==17.1.0 -Tempita==0.5.2 -tenacity==4.9.0 -testresources==2.0.1 -testscenarios==0.5.0 -testtools==2.2.0 -tooz==1.58.0 -tosca-parser==1.6.0 -traceback2==1.4.0 -unittest2==1.1.0 -urllib3==1.22 -vine==1.1.4 -voluptuous==0.11.1 -waitress==1.1.0 -warlock==1.3.0 -WebOb==1.7.1 -websocket-client==0.47.0 -WebTest==2.0.27 -wrapt==1.10.11 diff --git a/tacker/tests/unit/vnfpkgm/test_controller.py b/tacker/tests/unit/vnfpkgm/test_controller.py index e4a0d4725..7da574903 100644 --- a/tacker/tests/unit/vnfpkgm/test_controller.py +++ b/tacker/tests/unit/vnfpkgm/test_controller.py @@ -518,8 +518,6 @@ class TestController(base.TestCase): mock_vnf_by_id, mock_upload_vnf_package_content, mock_glance_store): - file_path = "tacker/tests/etc/samples/test_data.zip" - file_obj = open(file_path, "rb") updates = {'onboarding_state': 'CREATED', 'operational_state': 'DISABLED'} vnf_package_dict = fakes.fake_vnf_package(updates) @@ -533,7 +531,7 @@ class TestController(base.TestCase): % constants.UUID) req.headers['Content-Type'] = 'application/zip' req.method = 'PUT' - req.body = jsonutils.dump_as_bytes(file_obj) + req.body = jsonutils.dump_as_bytes(mock.mock_open()) resp = req.get_response(self.app) mock_glance_store.assert_called() self.assertEqual(http_client.ACCEPTED, resp.status_code) diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 07a078547..505a58cb7 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 " diff --git a/tox.ini b/tox.ini index e261ba52e..54cacf1fa 100644 --- a/tox.ini +++ b/tox.ini @@ -108,12 +108,6 @@ commands = commands = oslopolicy-sample-generator --config-file=etc/tacker-policy-generator.conf -[testenv:lower-constraints] -deps = - -c{toxinidir}/lower-constraints.txt - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt - [testenv:bindep] # Do not install any requirements. We want this to be fast and work even if # system dependencies are missing, since it's used to tell you what system