Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
bloom1 committed Sep 12, 2024
1 parent d0a0fba commit 7f7fe9f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion integration_tests/assets/docker-compose.base.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ services:
volumes:
- "./mocks/ari.py:/tmp/ari.py"
command: "python /tmp/ari.py 5039"

1 change: 1 addition & 0 deletions integration_tests/assets/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:
- "./keys/wazo-provd-key.yml:/var/lib/wazo-auth-keys/wazo-provd-key.yml"
- "./provd/null:/var/lib/wazo-provd/plugins/null"
- "./provd/zero:/var/lib/wazo-provd/plugins/zero"
- "${LOCAL_GIT_REPOS}/wazo-provd/wazo_provd:/opt/venv/lib/python3.9/site-packages/wazo_provd"
command: "bash -c 'wazo-provd-upgrade-db && twistd --nodaemon --no_save --pidfile= wazo-provd --stderr --verbose'"

postgres:
Expand Down
8 changes: 6 additions & 2 deletions integration_tests/suite/helpers/provd.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def params(self):

def reset(self):
self.clean_devices()
self.clean_configs()
# self.clean_configs()
self.add_default_configs()

def clean_devices(self):
Expand All @@ -103,7 +103,11 @@ def clean_configs(self):

def add_default_configs(self):
for config in self.DEFAULT_CONFIGS:
self.configs.create(config)
try:
self.configs.get(config['id'])
self.configs.update(config)
except ProvdError:
self.configs.create(config)

def add_device_template(self):
config = {
Expand Down

0 comments on commit 7f7fe9f

Please sign in to comment.