~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/tests/test_simple.py

Merged from trunk, resolved billions of conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
            folder = '%(branch)s'
52
52
    """
53
53
 
54
 
    def makeHistory(self):
55
 
        return History.from_folder(self.bzrbranch)
56
 
 
57
54
    def setUpLoggerhead(self):
58
 
        app = TestApp(BranchWSGIApp(self.bzrbranch).app)
 
55
        app = TestApp(BranchWSGIApp(self.branch).app)
59
56
        return app
60
57
 
61
58
    def tearDown(self):