~veebers/juju-ci-tools/perf-initial-heatmap-details

« back to all changes in this revision

Viewing changes to deploy_stack.py

  • Committer: Aaron Bentley
  • Date: 2016-06-01 13:57:51 UTC
  • mfrom: (1445 trunk)
  • mto: This revision was merged to the branch mainline in revision 1447.
  • Revision ID: aaron.bentley@canonical.com-20160601135751-ra426srp52pl73rh
Merge trunk into application-not-service.

Show diffs side-by-side

added added

removed removed

Lines of Context:
305
305
            '/var/log/juju/*.log',
306
306
            # TODO(gz): Also capture kvm container logs?
307
307
            '/var/lib/juju/containers/juju-*-lxc-*/',
 
308
            '/var/log/lxd/juju-*',
308
309
            '/var/log/syslog',
309
310
            '/var/log/mongodb/mongodb.log',
310
311
        ]
670
671
            if not self.keep_env:
671
672
                self.tear_down(self.jes_enabled)
672
673
 
 
674
    def _should_dump(self):
 
675
        if sys.platform == 'win32':
 
676
            return True
 
677
        from tests.test_jujupy import FakeBackend  # Circular imports
 
678
        return not isinstance(self.client._backend, FakeBackend)
 
679
 
673
680
    def dump_all_logs(self):
674
681
        """Dump logs for all models in the bootstrapped controller."""
675
 
        from tests.test_jujupy import FakeBackend  # Circular imports
676
 
        if isinstance(self.client._backend, FakeBackend):
677
 
            return
678
682
        # This is accurate because we bootstrapped self.client.  It might not
679
683
        # be accurate for a model created by create_environment.
 
684
        if not self._should_dump():
 
685
            return
680
686
        admin_client = self.client.get_admin_client()
681
687
        if not self.jes_enabled:
682
688
            clients = [self.client]