Go OpenStack Exchange

Merge lp://staging/~jameinel/goose/test-script into lp://staging/goose

  1. test-script
  2. Merge into trunk
Proposed by John A Meinel
Status: Merged
Approved by: Go Bot
Approved revision: 52
Merged at revision: 49
Proposed branch: lp://staging/~jameinel/goose/test-script
Merge into: lp://staging/goose
Diff against target: 195 lines (+191/-0)
1 file modified
test.py (+191/-0)
To merge this branch: bzr merge lp://staging/~jameinel/goose/test-script
Reviewer Review Type Date Requested Status
Go Bot Pending
Review via email: mp+144465@code.staging.launchpad.net

Commit message

Handle the case when 'goose' is a checkout, and not a full branch.

Description of the change

This fixes a problem with 'test.py' when running on the actual tarmac machine.

Tarmac uses a lightweight checkout, rather than a full branch. However 'go get' will create a full branch, so we still want to use a repository so that it can be used.

To post a comment you must log in.
Revision history for this message
Go Bot (go-bot) wrote :

The attempt to merge lp:~jameinel/goose/test-script into lp:~goose-bot/goose/trunk failed. Below is the output from the failed tests.

Setting GOPATH to: /home/tarmac/trees
Traceback (most recent call last):
  File "test.py", line 176, in <module>
    main(sys.argv[1:])
  File "test.py", line 161, in main
    tarmac_setup(opts)
  File "test.py", line 86, in tarmac_setup
    create_tarmac_repository()
  File "test.py", line 54, in create_tarmac_repository
    repo_format_name=repo_fmt.repository_format.get_format_string())
  File "/usr/lib/python2.7/dist-packages/bzrlib/bzrdir.py", line 1420, in initialize_on_transport_ex
    result = self.initialize_on_transport(transport)
  File "/usr/lib/python2.7/dist-packages/bzrlib/bzrdir.py", line 1334, in initialize_on_transport
    return self._initialize_on_transport_vfs(transport)
  File "/usr/lib/python2.7/dist-packages/bzrlib/bzrdir.py", line 1460, in _initialize_on_transport_vfs
    raise errors.AlreadyControlDirError(transport.base)
bzrlib.errors.AlreadyControlDirError: A control directory already exists: "file:///home/tarmac/trees/src/launchpad.net/".

lp://staging/~jameinel/goose/test-script updated
52. By John A Meinel

We can already have the repo created, but just not used by the lightweight checkout.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches