[Pkg-bazaar-commits] ./bzr-search/unstable r64: New upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 64
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Tue 2009-05-05 17:33:35 +0200
message:
  New upstream snapshot.
modified:
  debian/changelog
  tests/test_index.py
    ------------------------------------------------------------
    revno: 45.1.25
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Wed 2009-03-11 10:10:42 +1100
    message:
      Fix for bzr.dev test API changes.
    modified:
      tests/test_index.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-03-19 17:10:58 +0000
+++ b/debian/changelog	2009-05-05 15:33:35 +0000
@@ -1,9 +1,10 @@
-bzr-search (1.7.0~bzr69-2) UNRELEASED; urgency=low
+bzr-search (1.7.0~bzr70-1) unstable; urgency=low
 
   * Move to section vcs.
   * Bump standards version to 3.8.1.
+  * New upstream snapshot.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Thu, 19 Mar 2009 18:10:50 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Tue, 05 May 2009 17:32:07 +0200
 
 bzr-search (1.7.0~bzr69-1) unstable; urgency=low
 

=== modified file 'tests/test_index.py'
--- a/tests/test_index.py	2008-12-02 22:36:33 +0000
+++ b/tests/test_index.py	2009-03-10 23:10:42 +0000
@@ -24,11 +24,10 @@
 from bzrlib.plugins import search
 from bzrlib.plugins.search import errors, index
 from bzrlib.tests import (
-    adapt_tests,
     condition_isinstance,
+    multiply_tests,
     split_suite_by_condition,
     TestCaseWithTransport,
-    TestScenarioApplier,
     )
 
 
@@ -40,14 +39,13 @@
             TestComponentCombiner)))
     graph_suggestion, other_tests = split_suite_by_condition(other_tests,
         condition_isinstance(TestGraphIndexSuggestions))
-    adapter = TestScenarioApplier()
-    adapter.scenarios = [(format_string[:-1], {'format':format}) for
+    scenarios = [(format_string[:-1], {'format':format}) for
         format_string, format in index._FORMATS.items()]
-    adapt_tests(component_tests, adapter, other_tests)
-    adapter.scenarios = [
+    multiply_tests(component_tests, scenarios, other_tests)
+    scenarios = [
         ("GraphIndex", {'format': (InMemoryGraphIndex, index.SuggestableGraphIndex)}),
         ("BTree", {'format': (BTreeBuilder, index.SuggestableBTreeGraphIndex)})]
-    adapt_tests(graph_suggestion, adapter, other_tests)
+    multiply_tests(graph_suggestion, scenarios, other_tests)
     return other_tests