git-ubuntu

Merge ~nacc/git-ubuntu:importer-fix-tests into git-ubuntu:master

Proposed by Nish Aravamudan on 2018-04-16

Status:

Needs review

Proposed branch:

~nacc/git-ubuntu:importer-fix-tests

Merge into:

git-ubuntu:master

Prerequisite:

~nacc/git-ubuntu:importer-add-tests

Diff against target:

1124 lines (+307/-339) (has conflicts)

3 files modified

gitubuntu/git_repository.py (+0/-6)
gitubuntu/importer.py (+181/-292)
gitubuntu/test_importer.py (+126/-41)

Conflict in gitubuntu/test_importer.py

Related bugs:

Bug #1734883: import tag matching upload tag is nevertheless created in a separate commit	Undecided	Fix Released
Bug #1754194: importer: orphan tags do not incorporate upload tags	Undecided	Fix Released
Bug #1754507: import: if both orphan and import tags exist, but neither matches the tree, what should we do?	Undecided	Fix Released
Bug #1754706: importer: orphan tag is not created when the branch does not already exist	Undecided	Fix Released
Bug #1755247: Duplicate import tags not implemented	Undecided	Fix Released
Bug #1761331: If a reimport tag is found and the tree matches it should be used	Undecided	Fix Released
Bug #1761332: if multiple reimport tags are found for the changelog parent, they should all be parents	Undecided	Fix Released
Bug #1763778: importer: patches-applied tags are not reused correctly	Undecided	New

Link a bug report

Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Needs Fixing on 2018-06-01
Andreas Hasenack		2018-04-16	Pending
Robie Basak		2018-04-16	Pending
Review via email: mp+343354@code.staging.launchpad.net

Commit message

Make jenkins happy

Revision history for this message

Server Team CI bot (server-team-bot) wrote on 2018-04-16:

PASSED: Continuous integration, rev:b46daf40f4c060e10ce1d1c835ef7b424da9ead0
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/412/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/412/rebuild

review: Approve (continuous-integration)

Revision history for this message

Server Team CI bot (server-team-bot) wrote on 2018-06-01:

FAILED: Continuous integration, rev:ff3e691a3cf24b3a77d28e5d31625a0335d3a459
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/8/
Executed test runs:
SUCCESS: VM Setup
FAILED: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/8/rebuild