Add tox support
This commit is contained in:
parent
a747b8ff79
commit
442a9f35c9
@ -1,4 +1,5 @@
|
|||||||
revision
|
|
||||||
bin
|
bin
|
||||||
.coverage
|
.coverage
|
||||||
|
.testrepository
|
||||||
|
.tox
|
||||||
tags
|
tags
|
||||||
|
@ -323,7 +323,7 @@ class JujuCA(object):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def ca_key_path(self):
|
def ca_key_path(self):
|
||||||
return os.path.join(self.ca_dir, 'private', 'cacert.key')
|
return os.path.join(self.ca_dir, 'private', 'cacert.key')
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def root_ca_cert_path(self):
|
def root_ca_cert_path(self):
|
||||||
@ -331,7 +331,7 @@ class JujuCA(object):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def root_ca_key_path(self):
|
def root_ca_key_path(self):
|
||||||
return os.path.join(self.root_ca_dir, 'private', 'cacert.key')
|
return os.path.join(self.root_ca_dir, 'private', 'cacert.key')
|
||||||
|
|
||||||
def get_ca_bundle(self):
|
def get_ca_bundle(self):
|
||||||
int_cert = open(self.ca_cert_path).read()
|
int_cert = open(self.ca_cert_path).read()
|
||||||
|
@ -372,7 +372,7 @@ def save_script_rc():
|
|||||||
|
|
||||||
def do_openstack_upgrade_reexec(configs):
|
def do_openstack_upgrade_reexec(configs):
|
||||||
do_openstack_upgrade(configs)
|
do_openstack_upgrade(configs)
|
||||||
log("Re-execing hook to pickup upgraded packages", level=INFO)
|
log("Re-execing hook to pickup upgraded packages", level=INFO)
|
||||||
os.execl('./hooks/config-changed-postupgrade', '')
|
os.execl('./hooks/config-changed-postupgrade', '')
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,11 +1,7 @@
|
|||||||
from mock import patch
|
from mock import patch
|
||||||
|
|
||||||
with patch('charmhelpers.core.hookenv.config') as config:
|
with patch('hooks.keystone_utils.register_configs') as register_configs:
|
||||||
config.return_value = 'keystone'
|
import git_reinstall
|
||||||
import keystone_utils as utils # noqa
|
|
||||||
|
|
||||||
with patch('keystone_utils.register_configs') as register_configs:
|
|
||||||
import git_reinstall
|
|
||||||
|
|
||||||
from test_utils import (
|
from test_utils import (
|
||||||
CharmTestCase
|
CharmTestCase
|
||||||
|
Loading…
Reference in New Issue
Block a user