Colin Watson has proposed merging
lp:~cjwatson/launchpad/codeimport-worker-refactor into lp:launchpad with
lp:~cjwatson/launchpad/codeimport-source-details-refactor as a prerequisite.
Commit message:
Refactor various bits of the code import worker to be less Bazaar-specific.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #1469459 in Launchpad itself: "import external code into a LP git repo
(natively)"
https://bugs.launchpad.net/launchpad/+bug/1469459
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/codeimport-worker-refactor/+merge/308122
--
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~cjwatson/launchpad/codeimport-worker-refactor into lp:launchpad.
=== modified file 'lib/lp/code/xmlrpc/codeimportscheduler.py'
--- lib/lp/code/xmlrpc/codeimportscheduler.py 2016-10-11 13:46:57 +
+++ lib/lp/code/xmlrpc/codeimportscheduler.py 2016-10-11 13:46:57 +
@@ -69,10 +69,10 @@
job = self._getJob(job_id)
arguments = CodeImportSourceDetails.fromCodeImportJob(
job).asArguments()
-branch = job.code_import.branch
-branch_url = canonical_url(branch)
-log_file_name = '%s.log' % branch.unique_name[1:].replace('/', '-')
-return (arguments, branch_url, log_file_name)
+target = job.code_import.target
+target_url = canonical_url(target)
+log_file_name = '%s.log' % target.unique_name[1:].replace('/', '-')
+return (arguments, target_url, log_file_name)
@return_fault
def _updateHeartbeat(self, job_id, log_tail):
=== modified file 'lib/lp/code/xmlrpc/tests/test_codeimportscheduler.py'
--- lib/lp/code/xmlrpc/tests/test_codeimportscheduler.py 2016-10-11 13:46:57 +
+++ lib/lp/code/xmlrpc/tests/test_codeimportscheduler.py 2016-10-11 13:46:57 +
@@ -57,20 +57,20 @@
self.assertEqual(code_import_job.id, job_id)
def test_getImportDataForJobID(self):
-# getImportDataForJobID returns the worker arguments, branch url and
+# getImportDataForJobID returns the worker arguments, target url and
# log file name for an import corresponding to a particular job.
code_import_job = self.makeCodeImportJob(running=True)
code_import = removeSecurityProxy(code_import_job).code_import
-code_import_arguments, branch_url, log_file_name = \
+code_import_arguments, target_url, log_file_name = \
self.api.getImportDataForJobID(code_import_job.id)
import_as_arguments = CodeImportSourceDetails.fromCodeImportJob(
code_import_job).asArguments()
expected_log_file_name = '%s.log' % (
-code_import.branch.unique_name[1:].replace('/', '-'))
+code_import.target.unique_name[1:].replace('/', '-'))
self.assertEqual(
-(import_as_arguments, canonical_url(code_import.branch),
+(import_as_arguments, canonical_url(code_import.target),
expected_log_file_name),
-(code_import_arguments, branch_url, log_file_name))
+(code_import_arguments, target_url, log_file_name))
def test_getImportDataForJobID_not_found(self):
# getImportDataForJobID returns a NoSuchCodeImportJob fault when there
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py 2016-10-11 13:46:57 +
+++ lib/lp/codehosting/codeimport/tests/test_worker.py 2016-10-11 13:46:57 +
@@ -78,7 +78,7 @@
get_default_bazaar_branch_store,
GitImportWorker,
ImportDataStore,
-ImportWorker,
+ToBzrImportWorker,
)
from lp.codehosting.safe_open import (
AcceptAnythingPolicy,
@@ -428,7 +428,7 @@
source_details = self.factory.makeCodeImportSourceDetails()
# That the remote name is like this is part of the interface of
# ImportDataStore.
-remote_name = '%08x.tar.gz' % (source_details.branch_id,)
+remote_name = '%08x.tar.gz' % (source_details.target_id,)
local_name = '%s.tar.gz' % (self.factory.getUniqueString(),)
transport = self.get_transport()
transport.put_bytes(remote_name, '')
@@ -442,7 +442,7 @@
source_details = self.factory.makeCodeImportSourceDetails()
# That the remote name is like this is part of the interface of
# ImportDataStore.
-remote_name = '%08x.tar.gz' % (source_details.branch_id,)
+remote_name = '%08x.tar.gz' % (source_details.target_id,)
content = self.factory.getUniqueString()
transport = self.get_transport()
transport.put_bytes(remote_name, content)
@@ -457,7 +457,7 @@
source_details = self.factory.makeCodeImportSourceDetails()
# That the remote name is like this is part of the interface of
# ImportDataStore.
-remote_name = '%08x.tar.gz' % (source_details.branch_id,)
+remote_name = '%
