diff --git a/anvil/components/__init__.py b/anvil/components/__init__.py index 344255d9..8f3f9cd1 100644 --- a/anvil/components/__init__.py +++ b/anvil/components/__init__.py @@ -856,6 +856,10 @@ class PythonTestingComponent(component.Component): cmd.append('--nologcapture') for e in self._get_test_exclusions(): cmd.append('--exclude=%s' % (e)) + xunit_fn = self.get_option("xunit_filename"): + if xunit_fn: + cmd.append("--with-xunit") + cmd.append("--xunit-file=%s" % (xunit_fn)) return cmd def _use_pep8(self): @@ -922,7 +926,7 @@ class PythonTestingComponent(component.Component): cmd = self._get_test_command() env = self._get_env() with open(os.devnull, 'wb') as null_fh: - if self.get_bool_option("tests_verbose", default_value=False): + if self.get_bool_option("verbose", default_value=False): null_fh = None sh.execute(*cmd, stdout_fh=None, stderr_fh=null_fh, cwd=app_dir, env_overrides=env) diff --git a/anvil/components/helpers/nova.py b/anvil/components/helpers/nova.py index fa40ebf3..800649f2 100644 --- a/anvil/components/helpers/nova.py +++ b/anvil/components/helpers/nova.py @@ -286,7 +286,7 @@ class ConfConfigurator(object): # Used more than once so we calculate it ahead of time hostip = self.installer.get_option('ip') - nova_conf.add('verbose', self.installer.get_bool_option('verbose')) + nova_conf.add('verbose', self.installer.get_bool_option('log_verbose')) # Allow destination machine to match source for resize. nova_conf.add('allow_resize_to_same_host', True) diff --git a/conf/components/nova.yaml b/conf/components/nova.yaml index 804dd307..ac2f307c 100644 --- a/conf/components/nova.yaml +++ b/conf/components/nova.yaml @@ -102,7 +102,7 @@ nova_version: "1.1" scheduler: nova.scheduler.filter_scheduler.FilterScheduler # Should nova be in verbose mode? -verbose: True +log_verbose: True # Virtualization settings # Drivers known (libvirt, xensever, vmware, baremetal)