toolshed/abra
4
4
Fork 23
Code Issues 82 Pull Requests 12 Packages Releases 45 Activity

fix-integration-tests #403

Merged
p4u1 merged 22 commits from (deleted):fix-integration-tests into main 2024-03-11 13:27:21 +00:00
Conversation 3 Commits 22 Files Changed 16
+75 -63
p4u1 commented 2024-02-15 16:33:04 +00:00
Owner
Copy Link
Copy Source

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.

  • app_backup.bats (skip this one)
  • app_check.bats (fixed by bd21014fed)
  • app_cmd.bats (partially fixed in 08232b74f6), has known regression coop-cloud/organising#581
  • app_config.bats (no changes needed)
  • app_cp.bats (no changes needed)
  • app_deploy.bats
  • app_errors.bats (no changes needed)
  • app_list.bats (no changes needed)
  • app_logs.bats (no changes needed)
  • app_new.bats (no changes needed)
  • app_ps.bats (no changes needed)
  • app_remove.bats (fixed by 2f29fbeb2e)
  • app_restart.bats (no changes needed
  • app_restore.bats (fixed by f2dd5afc38)
  • app_rollback.bats (partially fixed by 6e99b74c24)
  • app_run.bats (no changes needed)
  • app_secret.bats (fixed by bd069d32f6)
  • app_services.bats (no changes needed)
  • app_undeploy.bats (no changes needed)
  • app_upgrade.bats (no changes needed)
  • app_version.bats (partially fixed by ad323ad2bd)
  • app_volume.bats (fixed by 03c3823770)
  • autocomplete.bats (no changes needed)
  • catalogue.bats (no changes needed)
  • dirs.bats (no changes needed)
  • install.bats (failes, but is expected)
  • recipe_diff.bats (no changes needed)
  • recipe_fetch.bats (no changes needed)
  • recipe_lint.bats (fixed by b6b0808066)
  • recipe_list.bats (no changes needed)
  • recipe_new.bats (fixed by 0aac464ded)
  • recipe_release.bats (no changes needed)
  • recipe_reset.bats (no changes needed)
  • recipe_sync.bats (no changes needed)
  • recipe_upgrade.bats (fixed by ab86904cf4)
  • recipe_version.bats (fixed by 81897bf4da)
  • server_add.bats
  • server_list.bats
  • server_prune.bats (no changes needed)
  • server_remove.bats
  • upgrade.bats
  • version.bats (no changes needed)
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. - [x] app_backup.bats (skip this one) - [x] app_check.bats (fixed by https://git.coopcloud.tech/coop-cloud/abra/commit/bd21014fedf6f8d4fb8f1baf44fb8b0df99fc326) - [x] app_cmd.bats (partially fixed in https://git.coopcloud.tech/coop-cloud/abra/commit/08232b74f6d512ab2ca7c08f67bb7c227b82a2ca), has known regression https://git.coopcloud.tech/coop-cloud/organising/issues/581 - [x] app_config.bats (no changes needed) - [x] app_cp.bats (no changes needed) - [x] app_deploy.bats - [x] app_errors.bats (no changes needed) - [x] app_list.bats (no changes needed) - [x] app_logs.bats (no changes needed) - [x] app_new.bats (no changes needed) - [x] app_ps.bats (no changes needed) - [x] app_remove.bats (fixed by [2f29fbeb2e](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/2f29fbeb2e018656413fa25f8615b7a98cdcb083)) - [x] app_restart.bats (no changes needed - [x] app_restore.bats (fixed by [f2dd5afc38](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/f2dd5afc38a25a8316899fa0c6d59499445868d7)) - [x] app_rollback.bats (partially fixed by https://git.coopcloud.tech/coop-cloud/abra/commit/6e99b74c24e92a293a5f71d7aacd552441dc8613) - [x] app_run.bats (no changes needed) - [x] app_secret.bats (fixed by https://git.coopcloud.tech/coop-cloud/abra/commit/bd069d32f6d58f12cf8b0d2a1fef0e4cdc50d94d) - [x] app_services.bats (no changes needed) - [x] app_undeploy.bats (no changes needed) - [x] app_upgrade.bats (no changes needed) - [x] app_version.bats (partially fixed by https://git.coopcloud.tech/coop-cloud/abra/commit/ad323ad2bd6184c69baf909f891a8bf8ffc168a4) - [x] app_volume.bats (fixed by [03c3823770](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/03c38237707ae795b723180eb07a7edc84a8de35)) - [x] autocomplete.bats (no changes needed) - [x] catalogue.bats (no changes needed) - [x] dirs.bats (no changes needed) - [x] install.bats (failes, but is expected) - [x] recipe_diff.bats (no changes needed) - [x] recipe_fetch.bats (no changes needed) - [x] recipe_lint.bats (fixed by [b6b0808066](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/b6b0808066a11e4bcd77517ec39600d500bcb944)) - [x] recipe_list.bats (no changes needed) - [x] recipe_new.bats (fixed by [0aac464ded](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/0aac464ded6b43afb3ec37ade2f64d6191b9838f)) - [x] recipe_release.bats (no changes needed) - [x] recipe_reset.bats (no changes needed) - [x] recipe_sync.bats (no changes needed) - [x] recipe_upgrade.bats (fixed by [ab86904cf4](https://git.coopcloud.tech/coop-cloud/abra/pulls/403/commits/ab86904cf45db89c7c189ca1fd9971909bd446dd)) - [x] recipe_version.bats (fixed by https://git.coopcloud.tech/coop-cloud/abra/commit/81897bf4daf6d37f3997fdea0deafb1d8f241c6c) - [x] server_add.bats - [x] server_list.bats - [x] server_prune.bats (no changes needed) - [x] server_remove.bats - [x] upgrade.bats - [x] version.bats (no changes needed)
p4u1 added 1 commit 2024-02-15 16:33:04 +00:00
fix tests/integration/app_check.bats
continuous-integration/drone/pr Build is passing
Details
bd21014fed
p4u1 added 1 commit 2024-02-15 17:10:13 +00:00
partially fix tests/integration/app_rollback.bats
continuous-integration/drone/pr Build is passing
Details
6e99b74c24
p4u1 added 1 commit 2024-02-18 11:04:28 +00:00
fix tests/integration/app_secret.bats
continuous-integration/drone/pr Build is passing
Details
bd069d32f6
p4u1 added 2 commits 2024-02-18 11:22:39 +00:00
fix _rm_server for local server 328b4d3859
partially fix tests/integration/app_version.bats
continuous-integration/drone/pr Build is passing
Details
ad323ad2bd
p4u1 added 1 commit 2024-02-18 13:12:36 +00:00
fix tests/integration/app_volume.bats
continuous-integration/drone/pr Build is passing
Details
03c3823770
p4u1 added 1 commit 2024-02-18 13:26:49 +00:00
fix tests/integration/app_restore.bats
continuous-integration/drone/pr Build is passing
Details
f2dd5afc38
p4u1 added 1 commit 2024-02-18 19:41:02 +00:00
partially fix tests/integration/app_cmd.bats
continuous-integration/drone/pr Build is passing
Details
08232b74f6
p4u1 added 1 commit 2024-02-18 20:57:41 +00:00
partially fix tests/integration/recipe_version.bats
continuous-integration/drone/pr Build is passing
Details
8a84b1067c
p4u1 added 1 commit 2024-02-23 11:12:59 +00:00
fix tests/integration/app_remove.bats
continuous-integration/drone/pr Build is passing
Details
2f29fbeb2e
p4u1 added 1 commit 2024-02-23 11:21:10 +00:00
fix tests/integration/recipe_lint.bats
continuous-integration/drone/pr Build is passing
Details
b6b0808066
p4u1 added 1 commit 2024-02-23 11:35:05 +00:00
fix tests/integration/recipe_new.bats
continuous-integration/drone/pr Build is passing
Details
0aac464ded
p4u1 added 1 commit 2024-02-23 11:37:29 +00:00
fix tests/integration/recipe_upgrade.bats
continuous-integration/drone/pr Build is passing
Details
ab86904cf4
decentral1se reviewed 2024-03-03 14:07:05 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

Thanks for this work! A few comments...

Also, several instances of shuffling the argument handling order which I think is related to coop-cloud/abra#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.

Thanks for this work! A few comments... Also, several instances of shuffling the argument handling order which I think is related to https://git.coopcloud.tech/coop-cloud/abra/pulls/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.
pkg/git/init.go Outdated
@@ -9,3 +9,2 @@
// Init inits a new repo and commits all the stuff if you want
func Init(repoPath string, commit bool) error {
if _, err := gitPkg.PlainInit(repoPath, false); err != nil {
func Init(repoPath string, commit bool, gitUser, gitEmail string) error {
decentral1se commented 2024-03-03 14:00:41 +00:00
Owner
Copy Link
Copy Source

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 ~/.gitconfig instead 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?

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 `~/.gitconfig` instead 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?
p4u1 commented 2024-03-04 15:42:02 +00:00
Author
Owner
Copy Link
Copy Source

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

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
decentral1se commented 2024-03-07 14:18:18 +00:00
Owner
Copy Link
Copy Source

@p4u1 yeh I'd say raise an issue and pull it out for now. We can loop back in another change.

@p4u1 yeh I'd say raise an issue and pull it out for now. We can loop back in another change.
p4u1 commented 2024-03-07 16:49:55 +00:00
Author
Owner
Copy Link
Copy Source

Pulled it out into a seperate pull request coop-cloud/abra#405
Also opened a issue coop-cloud/organising#580

Pulled it out into a seperate pull request https://git.coopcloud.tech/coop-cloud/abra/pulls/405 Also opened a issue https://git.coopcloud.tech/coop-cloud/organising/issues/580
p4u1 marked this conversation as resolved
tests/integration/app_check.bats Outdated
@@ -71,3 +71,3 @@
run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status
assert_output --partial 'behind 3'
assert_output --partial "Your branch is behind 'origin/main' by 3 commits"
decentral1se commented 2024-03-03 13:58:14 +00:00
Owner
Copy Link
Copy Source

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.

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.
p4u1 commented 2024-03-04 15:28:37 +00:00
Author
Owner
Copy Link
Copy Source

Sound good, changed it

Sound good, changed it
decentral1se marked this conversation as resolved
tests/integration/app_cmd.bats Outdated
@@ -104,3 +104,3 @@
run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status
refute_output --partial 'behind 3'
assert_output --partial "Your branch is up to date with 'origin/main'"
decentral1se commented 2024-03-03 14:01:45 +00:00
Owner
Copy Link
Copy Source

assert_output --partial "up to date"?

`assert_output --partial "up to date"`?
p4u1 commented 2024-03-04 15:28:53 +00:00
Author
Owner
Copy Link
Copy Source

Sound good, changed it

Sound good, changed it
decentral1se marked this conversation as resolved
tests/integration/app_remove.bats
@@ -108,0 +107,4 @@
# TODO: should wait as long as volume is no longer in use
sleep 10
run $ABRA app volume rm "$TEST_APP_DOMAIN" --no-input
decentral1se commented 2024-03-03 14:02:58 +00:00
Owner
Copy Link
Copy Source

Isn't this covered by coop-cloud/abra#399 now?

Isn't this covered by https://git.coopcloud.tech/coop-cloud/abra/pulls/399 now?
p4u1 commented 2024-03-07 17:40:47 +00:00
Author
Owner
Copy Link
Copy Source

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?

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?
decentral1se commented 2024-03-11 13:26:50 +00:00
Owner
Copy Link
Copy Source

coop-cloud/organising#582

https://git.coopcloud.tech/coop-cloud/organising/issues/582
decentral1se marked this conversation as resolved
decentral1se reviewed 2024-03-03 14:33:52 +00:00
tests/integration/recipe_version.bats Outdated
@@ -13,3 +13,3 @@
@test "error if not present in catalogue" {
run $ABRA recipe versions "$TEST_RECIPE"
run $ABRA recipe versions "not-in-catalogue"
decentral1se commented 2024-03-03 14:33:52 +00:00
Owner
Copy Link
Copy Source

Ah, this should be reverted because the example should never be in the catalogue but it can be cloned by abra. 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:

diff --git a/tests/integration/recipe_version.bats b/tests/integration/recipe_version.bats
index d25faef..eea0bce 100644
--- a/tests/integration/recipe_version.bats
+++ b/tests/integration/recipe_version.bats
@@ -12,7 +12,7 @@ setup() {
 }

 @test "error if not present in catalogue" {
-  run $ABRA recipe versions "not-in-catalogue"
+  run $ABRA recipe versions "example"
   assert_failure
   assert_output --partial "is not published on the catalogue"
 }
Ah, this should be reverted because the `example` should never be in the catalogue *but* it can be cloned by `abra`. 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: ```diff diff --git a/tests/integration/recipe_version.bats b/tests/integration/recipe_version.bats index d25faef..eea0bce 100644 --- a/tests/integration/recipe_version.bats +++ b/tests/integration/recipe_version.bats @@ -12,7 +12,7 @@ setup() { } @test "error if not present in catalogue" { - run $ABRA recipe versions "not-in-catalogue" + run $ABRA recipe versions "example" assert_failure assert_output --partial "is not published on the catalogue" } ```
👍 1
p4u1 marked this conversation as resolved
p4u1 added 1 commit 2024-03-04 15:24:59 +00:00
patches by decentral1se
continuous-integration/drone/pr Build is passing
Details
1fd14fa76f 
Co-authored-by: decentral1se <cellarspoon@riseup.net>
p4u1 commented 2024-03-04 15:30:19 +00:00
Author
Owner
Copy Link
Copy Source

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 :)

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 :)
🎉 1
p4u1 added 1 commit 2024-03-04 15:31:16 +00:00
changes git message asserts
continuous-integration/drone/pr Build is passing
Details
a760280564
p4u1 added 1 commit 2024-03-07 16:49:05 +00:00
Revert "fix tests/integration/recipe_new.bats"
continuous-integration/drone/pr Build is passing
Details
a44549117d 
This reverts commit 0aac464ded.
p4u1 added 1 commit 2024-03-11 11:28:54 +00:00
partial fix app_deploy.bats
continuous-integration/drone/pr Build is passing
Details
e84297425e
decentral1se added 1 commit 2024-03-11 13:03:42 +00:00
test: skip known failures [ci skip]
continuous-integration/drone/pr Build is passing
Details
81897bf4da 
See coop-cloud/abra#403
p4u1 added 1 commit 2024-03-11 13:04:05 +00:00
remove --no-converge-checks to make sure the network exists when the rollback command is executed
continuous-integration/drone/pr Build is passing
Details
555f830720
p4u1 added 1 commit 2024-03-11 13:11:44 +00:00
skip expected failure when running tests locally
continuous-integration/drone/pr Build is passing
Details
0ca65b1d4f
p4u1 added 1 commit 2024-03-11 13:21:35 +00:00
properly reset recipe
continuous-integration/drone/pr Build is passing
Details
0344203209
decentral1se added 1 commit 2024-03-11 13:22:35 +00:00
test: skip this test for $reasons
continuous-integration/drone/pr Build is passing
Details
ef5f54e146 
See coop-cloud/abra#403
p4u1 merged commit 40c0fb4bac into main 2024-03-11 13:27:21 +00:00
p4u1 deleted branch fix-integration-tests 2024-03-11 13:27:21 +00:00
p4u1 referenced this issue from a commit 2024-03-11 13:27:21 +00:00
fix-integration-tests (!403)
p4u1 referenced this issue from a commit 2024-03-11 13:29:01 +00:00
fix-integration-tests (!403)
Sign in to join this conversation.
Reviewers
No Reviewers
decentral1se
Labels
Clear labels
bug
Something is not working
 build
go build related issues
 ci/cd
Building things with CI/CD
 critical fix
https://docs.coopcloud.tech/federation/resolutions/passed/010/
 design
UI/UX
 documentation
Documenting all the things
 duplicate
This issue or pull request already exists
 easy-first-issue
Something for new people to get stuck into. We hope it's easy!
 enhancement
New feature
 help wanted
Need some help
 i10n
Everything to do with localisation
 i18n
Everything to do with internationalisation
 installer
Everything to do with the install script.
 invalid
Something is wrong
 question
More information is needed
 release
Release management
 release-candidate
Related to the new release candidate
 security
Security related
 tech-debt
test
Unit/integration testing
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm BornDeleuze Brooke carla cas (Cassowary) coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) iexos jade (Jade Ambrose) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) moosemower moritz notplants oxaliq (sorrel) p4u1 pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) renovate-bot (Comrade Renovate Bot) ripclap simon sixsmith (Sixsmith) stevensting trav (Trav Fryer) val (val (he/him)) yksflip
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: toolshed/abra#403