Skip to content

Commit

Permalink
ci_test: Use a different local branch name
Browse files Browse the repository at this point in the history
Like the mr commands, the ci commands are now expected to determine
the current upstream branch (if the local name is different).

To test this, change the ci status test to check out the remote
branch under a different local name.
  • Loading branch information
fmuellner committed Dec 10, 2020
1 parent 434587b commit 333616b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmd/ci_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ func Test_ciStatus(t *testing.T) {
t.Fatal(err)
}

cmd = exec.Command(labBinaryPath, "checkout", "origin/ci_test_pipeline")
cmd = exec.Command(labBinaryPath, "checkout", "-b", "ci_test_pipeline")
cmd.Dir = repo
if b, err := cmd.CombinedOutput(); err != nil {
t.Log(string(b))
t.Fatal(err)
}

cmd = exec.Command(labBinaryPath, "checkout", "-b", "ci_test_pipeline")
cmd = exec.Command(labBinaryPath, "branch", "-m", "local/ci_test_pipeline")
cmd.Dir = repo
if b, err := cmd.CombinedOutput(); err != nil {
t.Log(string(b))
Expand Down

0 comments on commit 333616b

Please sign in to comment.