~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-08-25 19:06:49 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20080825190649-pq87jonr4uvs7s0y
Tags: 1.6-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
    def formats_to_scenarios(self, formats):
53
53
        """Transform the input formats to a list of scenarios.
54
54
 
55
 
        :param formats: A list of (workingtree_format, bzrdir_format).
 
55
        :param formats: A list [workingtree_format].
56
56
        """
57
57
 
58
58
        result = []
59
 
        for workingtree_format, bzrdir_format in formats:
60
 
            result.append(self.create_scenario(workingtree_format,
61
 
                          bzrdir_format))
 
59
        for workingtree_format in formats:
 
60
            result.append(self.create_scenario(workingtree_format))
62
61
        return result
63
62
 
64
 
    def create_scenario(self, workingtree_format, bzrdir_format):
 
63
    def create_scenario(self, workingtree_format):
65
64
        """Create a scenario for the specified converter
66
65
 
67
66
        :param workingtree_format: The particular workingtree format to test.
72
71
        scenario_options = {
73
72
            "transport_server": self._transport_server,
74
73
            "transport_readonly_server": self._transport_readonly_server,
75
 
            "bzrdir_format": bzrdir_format,
 
74
            "bzrdir_format": workingtree_format._matchingbzrdir,
76
75
            "workingtree_format": workingtree_format,
77
76
            }
78
77
        return workingtree_format.__class__.__name__, scenario_options
134
133
        # None here will cause a readonly decorator to be created
135
134
        # by the TestCaseWithTransport.get_readonly_transport method.
136
135
        None,
137
 
        [(format, format._matchingbzrdir) for format in
138
 
         WorkingTreeFormat._formats.values() + _legacy_formats])
 
136
        WorkingTreeFormat._formats.values() + _legacy_formats)
139
137
 
140
138
    # add the tests for the sub modules
141
139
    adapt_modules(test_workingtree_implementations, adapter, loader, result)