~bzr/loggerhead/daily-ppa

« back to all changes in this revision

Viewing changes to loggerhead/tests/__init__.py

  • Committer: Max Bowsher
  • Date: 2011-03-15 00:35:34 UTC
  • mfrom: (182.150.14 trunk)
  • Revision ID: maxb@f2s.com-20110315003534-n4shb8sx63e14r3p
Merge trunk, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright 2006, 2010 Canonical Ltd
 
1
# Copyright 2006, 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
        (__name__ + '.' + x) for x in [
21
21
            'test_controllers',
22
22
            'test_corners',
 
23
            'test_load_test',
23
24
            'test_simple',
24
25
            'test_templating',
25
26
        ]]))