← Back to branch summary

~stub/charms/precise/postgresql/bug-1302494-fix-persistent-storage

« back to all changes in this revision

Viewing changes to test.py

  • Committer: Stuart Bishop
  • Date: 2014-01-22 07:23:51 UTC
  • mfrom: (46.8.34 use-swiftwal)
  • Revision ID: stuart@stuartbishop.net-20140122072351-g1ca14ouylgpkgur
Experimental SwiftWAL PITR support, per https://code.launchpad.net/~stub/charms/precise/postgresql/use-swiftwal/+merge/199942

Show diffs side-by-side

added added

removed removed

Lines of Context:
test.py
39
39
 
40
40
        # If the charms fail, we don't want tests to hang indefinitely.
41
41
        timeout = int(os.environ.get('TEST_TIMEOUT', 900))
42
 
        self.useFixture(fixtures.Timeout(timeout, gentle=True))
 
42
        if timeout > 0:
 
43
            self.useFixture(fixtures.Timeout(timeout, gentle=True))
43
44
 
44
45
    def sql(self, sql, postgres_unit=None, psql_unit=None, dbname=None):
45
46
        '''Run some SQL on postgres_unit from psql_unit.