Skip to content

Commit

Permalink
Update test requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
9seconds committed Nov 23, 2016
1 parent b6fd009 commit 33683de
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion backend/api/decapod_api/pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"gt": {"type": "integer"},
"gte": {"type": "integer"},
"lt": {"type": "integer"},
"gte": {"type": "integer"},
"lte": {"type": "integer"},
"regexp": {"type": "string"},
"ne": {
"oneOf": [
Expand Down
1 change: 1 addition & 0 deletions backend/migration/decapod_migration/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import pkg_resources

from decapod_migration import migrators

from decapod_common import cliutils
from decapod_common import log
from decapod_common.models import lock
Expand Down
6 changes: 3 additions & 3 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
ansible==2.1.2.0
ansible-lint==3.3.3
argon2_cffi==16.3.0
bandit==1.1.0
bandit==1.2.0
click==6.6
fauxfactory==2.0.9
flake8==3.0.4
flake8==3.2.1
flake8-bugbear==16.11.0
flake8-builtins==0.2
flake8-coding==1.3.0
Expand All @@ -28,7 +28,7 @@ jsonschema==2.5.1
lockfile==0.12.2
mongomock==3.7.0
pep8-naming==0.4.1
pycodestyle==2.1.0
pycodestyle==2.2.0
pycparser!=2.15
pygments-style-github==0.4
pymongo[tls]==3.3.1
Expand Down
1 change: 1 addition & 0 deletions decapodcli/decapodcli/cloud_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import click

from decapodcli import main

from decapodlib import cloud_config


Expand Down
1 change: 1 addition & 0 deletions decapodcli/decapodcli/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

from decapodcli import param_types
from decapodcli import utils

from decapodlib import exceptions


Expand Down
5 changes: 3 additions & 2 deletions decapodcli/decapodcli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

from decapodcli import decorators
from decapodcli import utils

import decapodlib


Expand Down Expand Up @@ -124,8 +125,8 @@ def cli(ctx, url, login, password, no_verify, ssl_certificate, debug,
"format": output_format,
"no_pager": no_pager,
"client": decapodlib.Client(url, login, password,
timeout=timeout, verify=not no_verify,
certificate_file=ssl_certificate)
timeout=timeout, verify=not no_verify,
certificate_file=ssl_certificate)
}
utils.configure_logging(debug)

Expand Down
5 changes: 3 additions & 2 deletions decapodlib/decapodlib/cloud_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
"""This module has routines to help user to build user-data configs for
`cloud-init <http://cloudinit.readthedocs.io>`_.
Decapod uses cloud-init to implement server discovery. On each server boot
user-data will be executed (you may consider cloud-init as rc.local on steroids).
Decapod uses cloud-init to implement server discovery. On each server
boot user-data will be executed (you may consider cloud-init as rc.local
on steroids).
Basically, it creates several files on the host system and put their
execution into host rc.local.
Expand Down
2 changes: 1 addition & 1 deletion plugins/playbook/server_discovery/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
packages=setuptools.find_packages(),
entry_points={
"decapod.playbooks": [
"server_discovery = decapod_server_discovery.plugin:ServerDiscovery"
"server_discovery = decapod_server_discovery.plugin:ServerDiscovery" # NOQA
]
},
python_requires=">= 3.4",
Expand Down
2 changes: 0 additions & 2 deletions tests/common/models/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ def test_create_server_again_nothing_happened(parameter, configure_model):
"initiator_id": pytest.faux.gen_uuid(),
"server_id": pytest.faux.gen_uuid(),
"facts": {},
"initiator_id": pytest.faux.gen_uuid()
}

model = server.ServerModel.create(**params)
Expand All @@ -107,7 +106,6 @@ def test_create_server_again(parameter, configure_model):
"username": pytest.faux.gen_alphanumeric(),
"fqdn": pytest.faux.gen_alphanumeric(),
"ip": pytest.faux.gen_ipaddr(),
"initiator_id": pytest.faux.gen_uuid(),
"server_id": pytest.faux.gen_uuid(),
"facts": {},
"initiator_id": pytest.faux.gen_uuid()
Expand Down

0 comments on commit 33683de

Please sign in to comment.