Merge lp:~jml/testrepository/load-implies-init into lp:~testrepository/testrepository/trunk

[Jonathan Lange]

I keep being bugged by having to run "testr init" every time I make a new branch. So I've fixed the bug.

The branch does this by modifying the interface to RepositoryFactory, requiring it to raise RepositoryNotFound when it cannot find a repository at the given URL. The branch adds the new exception type and tests for the interface, and then modifies the file and memory repositories to provide the interface correctly.

The upshot of this change is that bug 530010 gets fixed automatically. Which is nice.

The branch then adds a new test for the 'load' command to show that it tries to open a repository and then initializes[1] the repository if it is not found.

[1] Following OED preferred spelling.

[Robert Collins (lifeless)]

I'm really torn on this. I like the potential improvements in repository error output (especially if we use exception chaining or some such).

However, auto-initialising a repo really rubs me badly.

How would you feel if I merged all but the last revision?

review: Needs Information

[lp:~jml/testrepository/load-implies-init]

95. By Jonathan Lange on 2010-09-02

Merge trunk. Resolve conflicts.

96. By Jonathan Lange on 2010-09-02

NEWS message.

[Jonathan Lange (jml)]

I'd be OK with that (assuming you mean r94). It's still a net improvement. I do, however, think that testr still has some way to go to work in a pleasing way as part of a directory-per-branch workflow.

[Robert Collins (lifeless)]

I'd be ok with a flag to say 'just do it'.

[Robert Collins (lifeless)]

This is blocked pending a flag to control this being added. E.g. --auto, --force, --magic - whatever.

[Jonathan Lange (jml)]

Updated to be --force-init.

[lp:~jml/testrepository/load-implies-init]

97. By Jonathan Lange on 2010-09-17

Merge trunk

98. By Jonathan Lange on 2011-01-13

Merge trunk

99. By Jonathan Lange on 2011-01-13

Add a '--force-init' option and only initialize repo on load if it's passed.

100. By Jonathan Lange on 2011-01-14

Restore NEWS item lost in conflict

101. By Jonathan Lange on 2011-01-14

Use assertThat

=== modified file 'testrepository/commands/load.py'
--- testrepository/commands/load.py	2010-12-07 03:16:41 +0000
+++ testrepository/commands/load.py	2011-01-14 00:14:11 +0000
@@ -20,6 +20,7 @@
 from testtools import ConcurrentTestSuite, MultiTestResult
 
 from testrepository.commands import Command
+from testrepository.repository import RepositoryNotFound
 from testrepository.results import TestResultFilter
 
 
@@ -37,11 +38,21 @@
     options = [
         optparse.Option("--partial", action="store_true",
             default=False, help="The stream being loaded was a partial run."),
+        optparse.Option(
+            "--force-init", action="store_true",
+            default=False,
+            help="Initialise the repository if it does not exist already"),
         ]
 
     def run(self):
         path = self.ui.here
-        repo = self.repository_factory.open(path)
+        try:
+            repo = self.repository_factory.open(path)
+        except RepositoryNotFound:
+            if self.ui.options.force_init:
+                repo = self.repository_factory.initialise(path)
+            else:
+                raise
         run_id = None
         # Not a full implementation of TestCase, but we only need to iterate
         # back to it. Needs to be a callable - its a head fake for

=== modified file 'testrepository/tests/commands/test_load.py'
--- testrepository/tests/commands/test_load.py	2010-12-07 03:16:41 +0000
+++ testrepository/tests/commands/test_load.py	2011-01-14 00:14:11 +0000
@@ -15,12 +15,13 @@
 """Tests for the load command."""
 
 import testtools
+from testtools.matchers import MatchesException
 
 from testrepository.commands import load
 from testrepository.ui.model import UI
 from testrepository.tests import ResourcedTestCase, Wildcard
 from testrepository.tests.test_repository import RecordingRepositoryFactory
-from testrepository.repository import memory
+from testrepository.repository import memory, RepositoryNotFound
 
 
 class TestCommandLoad(ResourcedTestCase):
@@ -42,6 +43,31 @@
         # Results loaded
         self.assertEqual(1, repo.count())
 
+    def test_load_initialises_repo_if_doesnt_exist_and_init_forced(self):
+        ui = UI([('subunit', '')], options=[('force_init', True)])
+        cmd = load.load(ui)
+        ui.set_command(cmd)
+        calls = []
+        cmd.repository_factory = RecordingRepositoryFactory(calls,
+            memory.RepositoryFactory())
+        del calls[:]
+        cmd.execute()
+        self.assertEqual([('open', ui.here), ('initialise', ui.here)], calls)
+
+    def test_load_errors_if_repo_doesnt_exist(self):
+        ui = UI([('subunit', '')])
+        cmd = load.load(ui)
+        ui.set_command(cmd)
+        calls = []
+        cmd.repository_factory = RecordingRepositoryFactory(calls,
+            memory.RepositoryFactory())
+        del calls[:]
+        cmd.execute()
+        self.assertEqual([('open', ui.here)], calls)
+        self.assertEqual([('error', Wildcard)], ui.outputs)
+        self.assertThat(
+            ui.outputs[0][1], MatchesException(RepositoryNotFound('memory:')))
+
     def test_load_returns_0_normally(self):
         ui = UI([('subunit', '')])
         cmd = load.load(ui)