fix-integration-tests #403
No reviewers
Labels
No Label
bug
build
ci/cd
contributing
design
documentation
duplicate
enhancement
help wanted
invalid
meta
question
security
wontfix
No Milestone
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: coop-cloud/abra#403
Loading…
Reference in New Issue
No description provided.
Delete Branch "p4u1/abra:fix-integration-tests"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
In preparation for the new abra release, let's fix all integration tests
After merging, this needs to be cherry-picked into the release-0-9 branch.
bd21014fed)08232b74f6), has known regression coop-cloud/organising#5816e99b74c24)bd069d32f6)ad323ad2bd)81897bf4da)Thanks for this work! A few comments...
Also, several instances of shuffling the argument handling order which I think is related to #404? Ideally, this shouldn't be necessary and we can pin and maintain the current behaviour. Possible changes to this can come in a new proposal.
@ -9,3 +9,2 @@// Init inits a new repo and commits all the stuff if you wantfunc Init(repoPath string, commit bool) error {if _, err := gitPkg.PlainInit(repoPath, false); err != nil {func Init(repoPath string, commit bool, gitUser, gitEmail string) error {This seems like a behaviour change, not a fix? What error were you facing?
I wouldn't mind erroring out here in the case people don't have a
~/.gitconfiginstead of implementing this as additional flags? According to https://pkg.go.dev/github.com/go-git/go-git/v5#CommitOptions 👉 "If Author is empty the Name and Email is read from the config".We could also additionally document to support people to know how to do this inside of Git and not in Abra?
Yeah this is a behavior change. It is for the case when no author is set in the
~/.gitconfig. I think it is a nice addition but probably better to pull it out into a separate pull request@p4u1 yeh I'd say raise an issue and pull it out for now. We can loop back in another change.
Pulled it out into a seperate pull request #405
Also opened a issue coop-cloud/organising#580
@ -71,3 +71,3 @@run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" statusassert_output --partial 'behind 3'assert_output --partial "Your branch is behind 'origin/main' by 3 commits"Seems a bit brittle, could we instead do a
assert_output --regexp 'behind .* 3 commits'? Because that is the main thing we're matching on. Not the branch name / remote and so on. I think this might save us revisiting mass-edits on this again in the near future.Same applies for the rest of the edits like this elsewhere.
Sound good, changed it
@ -104,3 +104,3 @@run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" statusrefute_output --partial 'behind 3'assert_output --partial "Your branch is up to date with 'origin/main'"assert_output --partial "up to date"?Sound good, changed it
@ -108,0 +107,4 @@# TODO: should wait as long as volume is no longer in usesleep 10run $ABRA app volume rm "$TEST_APP_DOMAIN" --no-inputIsn't this covered by #399 now?
It should be, but doesn't seem to work for me without the sleep. Can you check if it works for you without the sleep?
coop-cloud/organising#582
@ -13,3 +13,3 @@@test "error if not present in catalogue" {run $ABRA recipe versions "$TEST_RECIPE"run $ABRA recipe versions "not-in-catalogue"Ah, this should be reverted because the
exampleshould never be in the catalogue but it can be cloned byabra. So the resulting error is now "can't clone", not "can't find in catalogue". I just realised I can't push to your fork so here is the diff:We are getting closer! Thanks for you feedback to my changes, I will take a closer look soon.
Also you should have edit rights now :)