← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testfetch.py

merge John Meinels http test server reliability patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testfetch.py
20
20
import sys
21
21
import os
22
22
 
23
 
from testsweet import InTempDir
 
23
from bzrlib.selftest import TestCaseInTempDir
24
24
        
25
25
 
26
 
class TestFetch(InTempDir):
 
26
class TestFetch(TestCaseInTempDir):
27
27
    def runTest(self):
28
 
        from bzrlib.commit import commit
29
28
        from bzrlib.fetch import greedy_fetch, has_revision
30
 
        from bzrlib.selftest.testrevision import make_branches
31
29
 
32
30
        def new_branch(name):
33
31
            os.mkdir(name)
34
 
            return Branch(name, init=True)
 
32
            return Branch.initialize(name)
35
33
            
36
34
        #highest indices a: 5, b: 7
37
35
        br_a, br_b = make_branches()
93
91
 
94
92
 
95
93
if __name__ == '__main__':
96
 
    import sys
97
 
    sys.exit(run_suite(unittest.makeSuite()))
 
94
    import unittest
 
95
    sys.exit(unittest.run_suite(unittest.makeSuite()))