launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:remove-old-svn-code-import-tests into launchpad:master.

Commit message:
Remove integration tests for CSCVS-based Subversion imports

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/394119

We removed the actual import type in 2014.  The remaining tests were accidentally more-or-less-synonymous with the bzr-svn integration tests (except for running from a file:// URL rather than an svn:// URL), so we don't need to keep them around.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-old-svn-code-import-tests into launchpad:master.

diff --git a/lib/lp/codehosting/codeimport/tests/test_workermonitor.py b/lib/lp/codehosting/codeimport/tests/test_workermonitor.py
index df206b6..734c259 100644
--- a/lib/lp/codehosting/codeimport/tests/test_workermonitor.py
+++ b/lib/lp/codehosting/codeimport/tests/test_workermonitor.py
@@ -650,17 +650,6 @@ class TestWorkerMonitorIntegration(TestCaseInTempDir, TestCase):
         return self.factory.makeCodeImport(
             cvs_root=cvs_server.getRoot(), cvs_module=u'trunk')
 
-    def makeSVNCodeImport(self):
-        """Make a `CodeImport` that points to a real Subversion repository."""
-        self.subversion_server = SubversionServer(self.repo_path)
-        self.subversion_server.start_server()
-        self.addCleanup(self.subversion_server.stop_server)
-        url = self.subversion_server.makeBranch(
-            'trunk', [('README', b'contents')])
-        self.foreign_commit_count = 2
-
-        return self.factory.makeCodeImport(svn_branch_url=url)
-
     def makeBzrSvnCodeImport(self):
         """Make a `CodeImport` that points to a real Subversion repository."""
         self.subversion_server = SubversionServer(
@@ -809,16 +798,6 @@ class TestWorkerMonitorIntegration(TestCaseInTempDir, TestCase):
         self.assertImported(code_import_id)
 
     @defer.inlineCallbacks
-    def test_import_subversion(self):
-        # Create a Subversion CodeImport and import it.
-        job = self.getStartedJobForImport(self.makeSVNCodeImport())
-        code_import_id = job.code_import.id
-        job_id = job.id
-        self.layer.txn.commit()
-        yield self.performImport(job_id)
-        self.assertImported(code_import_id)
-
-    @defer.inlineCallbacks
     def test_import_git(self):
         # Create a Git CodeImport and import it.
         job = self.getStartedJobForImport(self.makeGitCodeImport())