← Back to branch summary

~lifeless/pyjuju/lxc

« back to all changes in this revision

Viewing changes to ensemble/tests/common.py

  • Committer: Clint Byrum
  • Date: 2011-06-25 23:16:20 UTC
  • Revision ID: clint@ubuntu.com-20110625231620-xoj11oiwibfzvgp5
all tests pass, but with shutdown hack

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/tests/common.py
101
101
    def stop_daemonized(self):
102
102
        log.info("Stopping daemonized zookeeper: installed=%s, port=%s",
103
103
                 self.install_path, self.port)
 
104
 
104
105
        if os.path.exists(self.pidfile):
105
106
            subprocess.check_call(['start-stop-daemon','--stop',
106
107
                '--retry=TERM/30/KILL/5',
107
108
                '--pidfile',self.pidfile])
108
109
        else:
109
 
            log.info("No pidfile found")
 
110
            log.info("No pidfile found, not killing")
 
111
 
110
112
        try:
111
113
            shutil.rmtree(self.working_path)
112
114
        except: