Misc tidy, drop sync tool

This commit is contained in:
James Page
2020-03-11 13:39:08 +00:00
parent a14d672e52
commit 6781e1fd17
3 changed files with 45 additions and 21 deletions

View File

@@ -1,17 +0,0 @@
import sys
import settings
import subprocess
ls = settings.INSTALLED_APPS
data = ""
for app in ls:
if app != "dashboards":
data += "-i " + str(app) + " "
cmd = (
"{} /usr/share/openstack-dashboard/manage.py collectstatic"
" --noinput {}".format(sys.executable, data)
)
subprocess.call(cmd, shell=True)

View File

@@ -97,10 +97,8 @@ class TestDmapiHandlers(test_utils.PatchHelper):
# test that the hooks actually registered the relation expressions that
# are meaningful for this interface: this is to handle regressions.
# The keys are the function names that the hook attaches to.
when_patterns = {
}
when_not_patterns = {
}
when_patterns = {}
when_not_patterns = {}
# check the when hooks are attached to the expected functions
for t, p in [
(_when_args, when_patterns),

View File

@@ -0,0 +1,43 @@
# Copyright 2020 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import charm.openstack.trilio_horizon_plugin as trilio_horizon
import charms_openstack.test_utils as test_utils
class Helper(test_utils.PatchHelper):
def setUp(self):
super().setUp()
self.patch_release(trilio_horizon.TrilioHorizonPluginCharm.release)
class TestTrilioHorizonCharm(Helper):
def test_packages_py2(self):
dm_charm = trilio_horizon.TrilioHorizonPluginCharm()
self.patch_object(trilio_horizon.hookenv, "config")
self.config.return_value = 2
self.assertEqual(
dm_charm.packages,
["python-workloadmgrclient", "tvault-horizon-plugin"],
)
def test_packages_py3(self):
dm_charm = trilio_horizon.TrilioHorizonPluginCharm()
self.patch_object(trilio_horizon.hookenv, "config")
self.config.return_value = 3
self.assertEqual(
dm_charm.packages,
["python3-workloadmgrclient", "python3-tvault-horizon-plugin"],
)