Fix testing

Change-Id: I2a340ad11483321aae7a64a53ddda09cb5bc9aa7
This commit is contained in:
Tobias Urdin 2021-04-22 16:34:08 +02:00
parent 7f4fd7bb12
commit e16d09d428
6 changed files with 11 additions and 14 deletions

View File

@ -25,10 +25,10 @@ dulwich==0.19.0
extras==1.0.0 extras==1.0.0
fasteners==0.14.1 fasteners==0.14.1
fixtures==3.0.0 fixtures==3.0.0
flake8==2.5.5 flake8==3.8.0
futurist==1.6.0 futurist==1.6.0
hacking==0.12.0 hacking==4.0.0
horizon==17.1.0 horizon==18.5.0
idna==2.6 idna==2.6
imagesize==1.0.0 imagesize==1.0.0
iso8601==0.1.12 iso8601==0.1.12
@ -40,7 +40,7 @@ jsonschema==2.6.0
keystoneauth1==3.4.0 keystoneauth1==3.4.0
linecache2==1.0.0 linecache2==1.0.0
MarkupSafe==1.0 MarkupSafe==1.0
mccabe==0.2.1 mccabe==0.6.0
monotonic==1.4 monotonic==1.4
msgpack==0.5.6 msgpack==0.5.6
munch==2.2.0 munch==2.2.0
@ -66,7 +66,7 @@ pep8==1.5.7
Pint==0.8.1 Pint==0.8.1
prettytable==0.7.2 prettytable==0.7.2
pycparser==2.18 pycparser==2.18
pyflakes==2.1.1 pyflakes==2.2.0
Pygments==2.2.0 Pygments==2.2.0
pyinotify==0.9.6 pyinotify==0.9.6
pymongo==3.6.1 pymongo==3.6.1
@ -126,7 +126,7 @@ XStatic-jquery-ui==1.12.0.1
XStatic-JQuery.quicksearch==2.0.3.1 XStatic-JQuery.quicksearch==2.0.3.1
XStatic-JQuery.TableSorter==2.14.5.1 XStatic-JQuery.TableSorter==2.14.5.1
XStatic-JSEncrypt==2.3.1.1 XStatic-JSEncrypt==2.3.1.1
XStatic-mdi==1.4.57.0 XStatic-mdi==1.6.50.2
XStatic-objectpath==1.2.1.0 XStatic-objectpath==1.2.1.0
XStatic-Rickshaw==1.5.0.0 XStatic-Rickshaw==1.5.0.0
XStatic-roboto-fontface==0.5.0.0 XStatic-roboto-fontface==0.5.0.0

View File

@ -232,7 +232,7 @@ class ClusterResize(generic.View):
worker_nodes = [] worker_nodes = []
for server in servers: for server in servers:
if (server.name.startswith("%s-minion" % stack.stack_name) or if (server.name.startswith("%s-minion" % stack.stack_name) or # noqa
server.name.startswith("%s-node" % stack.stack_name)): server.name.startswith("%s-node" % stack.stack_name)):
worker_nodes.append({"name": server.name, "id": server.id}) worker_nodes.append({"name": server.name, "id": server.id})

View File

@ -59,7 +59,7 @@ class MagnumRestTestCase(test.TestCase):
def test_cluster_template_delete(self, client): def test_cluster_template_delete(self, client):
test_cluster_template = TEST.cluster_templates.first() test_cluster_template = TEST.cluster_templates.first()
request = self.mock_rest_request( request = self.mock_rest_request(
body='{"cluster_template_id":' + body='{"cluster_template_id":' + # noqa
str(test_cluster_template['uuid']) + '}') str(test_cluster_template['uuid']) + '}')
response = magnum.ClusterTemplates().delete(request) response = magnum.ClusterTemplates().delete(request)

View File

@ -7,11 +7,7 @@
# be installed in a specific order. # be installed in a specific order.
# #
# Hacking should appear first in case something else depends on pep8 # Hacking should appear first in case something else depends on pep8
hacking>=1.1.0,<1.2.0 # Apache-2.0 hacking>=4.0.0,<4.1.0 # Apache-2.0
# remove this pyflakes from here once you bump the
# hacking to 3.2.0 or above. hacking 3.2.0 takes
# care of pyflakes version compatibilty.
pyflakes>=2.1.1
coverage!=4.4,>=4.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0
nodeenv>=0.9.4 # BSD nodeenv>=0.9.4 # BSD

View File

@ -67,5 +67,6 @@ def main(argv):
install.install_dependencies() install.install_dependencies()
print_help(venv, root) print_help(venv, root)
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))

View File

@ -70,7 +70,7 @@ class InstallVenv(object):
check_exit_code)[0] check_exit_code)[0]
def get_distro(self): def get_distro(self):
if (os.path.exists('/etc/fedora-release') or if (os.path.exists('/etc/fedora-release') or # noqa
os.path.exists('/etc/redhat-release')): os.path.exists('/etc/redhat-release')):
return Fedora( return Fedora(
self.root, self.venv, self.requirements, self.root, self.venv, self.requirements,