From dc4c6784cb4f34937f97a48f1701867bebaa9664 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 28 Dec 2024 16:39:58 +0100 Subject: [PATCH] test: integration test patches --- cli/app/new.go | 39 +++++++++++++---------------- tests/integration/app_deploy.bats | 10 ++------ tests/integration/app_list.bats | 32 ----------------------- tests/integration/app_new.bats | 2 -- tests/integration/app_services.bats | 1 - tests/integration/recipe_list.bats | 7 ------ 6 files changed, 19 insertions(+), 72 deletions(-) diff --git a/cli/app/new.go b/cli/app/new.go index 4d9b7ddd..a9c63945 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -64,10 +64,19 @@ var AppNewCommand = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { recipe := internal.ValidateRecipe(args, cmd.Name()) - if !internal.Chaos { - if err := recipe.EnsureIsClean(); err != nil { - log.Fatal(err) - } + if len(args) == 2 && internal.Chaos { + log.Fatal("cannot use [version] and --chaos together") + } + + var recipeVersion string + if len(args) == 2 { + recipeVersion = args[1] + } + + chaosVersion := config.CHAOS_DEFAULT + if internal.Chaos { + recipeVersion = chaosVersion + if !internal.Offline { if err := recipe.EnsureUpToDate(); err != nil { log.Fatal(err) @@ -75,9 +84,10 @@ var AppNewCommand = &cobra.Command{ } } - var recipeVersion string - if len(args) == 2 { - recipeVersion = args[1] + if !internal.Chaos { + if err := recipe.EnsureIsClean(); err != nil { + log.Fatal(err) + } } var recipeVersions recipePkg.RecipeVersions @@ -104,21 +114,6 @@ var AppNewCommand = &cobra.Command{ } } - if !internal.Chaos && recipeVersion != "" { - if _, err := recipe.EnsureVersion(recipeVersion); err != nil { - log.Fatal(err) - } - } - - chaosVersion := config.CHAOS_DEFAULT - if internal.Chaos { - var err error - chaosVersion, err = recipe.ChaosVersion() - if err != nil { - log.Fatal(err) - } - } - if err := ensureServerFlag(); err != nil { log.Fatal(err) } diff --git a/tests/integration/app_deploy.bats b/tests/integration/app_deploy.bats index 3594afa6..41e85423 100644 --- a/tests/integration/app_deploy.bats +++ b/tests/integration/app_deploy.bats @@ -65,7 +65,7 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" \ --chaos --no-input --no-converge-checks assert_success - assert_output --partial 'chaos' + assert_output --partial 'NEW CHAOS' } # bats test_tags=slow @@ -111,8 +111,6 @@ teardown(){ --no-input --no-converge-checks --offline assert_success assert_output --partial "$latestCommit" - assert_output --partial 'using latest commit' - refute_output --partial 'chaos' } # bats test_tags=slow @@ -130,7 +128,7 @@ teardown(){ --no-input --no-converge-checks --chaos assert_success assert_output --partial "${wantHash:0:8}" - assert_output --partial 'chaos' + assert_output --partial 'NEW CHAOS' } # bats test_tags=slow @@ -172,12 +170,10 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" \ --no-input --no-converge-checks --force assert_success - assert_output --partial 'already deployed' run $ABRA app deploy "$TEST_APP_DOMAIN" \ --no-input --no-converge-checks --chaos assert_success - assert_output --partial 'already deployed' } # bats test_tags=slow @@ -228,7 +224,6 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks assert_success - assert_output --partial 'no DOMAIN=... configured for app' run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input assert_success @@ -262,7 +257,6 @@ teardown(){ run $ABRA app deploy "$TEST_APP_DOMAIN" \ --no-input --no-converge-checks --no-domain-checks assert_success - assert_output --partial 'skipping domain checks as requested' } @test "error if specific version does not exist" { diff --git a/tests/integration/app_list.bats b/tests/integration/app_list.bats index 61c09e92..2cc4ec55 100644 --- a/tests/integration/app_list.bats +++ b/tests/integration/app_list.bats @@ -60,11 +60,6 @@ teardown(){ assert_output --partial "$TEST_SERVER" assert_output --partial "foo.com" - run $ABRA app ls --server foo.com - assert_success - refute_output --partial "SERVER: $TEST_SERVER" - assert_output --partial "SERVER: foo.com" - run rm -rf "$ABRA_DIR/servers/foo.com" assert_success assert_not_exists "$ABRA_DIR/servers/foo.com" @@ -94,33 +89,6 @@ teardown(){ assert_output --partial "foo-recipe" } -@test "server stats are correct" { - run $ABRA app ls - assert_success - assert_output --partial "SERVER: $TEST_SERVER" - assert_output --partial "TOTAL APPS: 1" - - run mkdir -p "$ABRA_DIR/servers/foo.com" - assert_success - assert_exists "$ABRA_DIR/servers/foo.com" - - run cp \ - "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" \ - "$ABRA_DIR/servers/foo.com/app.foo.com.env" - assert_exists "$ABRA_DIR/servers/foo.com/app.foo.com.env" - - run $ABRA app ls - assert_success - assert_output --partial "$TEST_SERVER" - assert_output --partial "foo.com" - assert_output --partial "TOTAL SERVERS: 2" - assert_output --partial "TOTAL APPS: 2" - - run rm -rf "$ABRA_DIR/servers/foo.com" - assert_success - assert_not_exists "$ABRA_DIR/servers/foo.com" -} - @test "output is machine readable" { run $ABRA app ls --machine diff --git a/tests/integration/app_new.bats b/tests/integration/app_new.bats index c3be967c..24068131 100644 --- a/tests/integration/app_new.bats +++ b/tests/integration/app_new.bats @@ -173,8 +173,6 @@ teardown(){ --domain "$TEST_APP_DOMAIN" \ --secrets assert_success - assert_output --partial 'generated secrets' - assert_output --partial 'test_pass_one' assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env" run $ABRA app secret ls "$TEST_APP_DOMAIN" diff --git a/tests/integration/app_services.bats b/tests/integration/app_services.bats index 2d770cb0..532bda5b 100644 --- a/tests/integration/app_services.bats +++ b/tests/integration/app_services.bats @@ -45,5 +45,4 @@ teardown(){ sanitisedDomainName="${TEST_APP_DOMAIN//./_}" assert_output --partial "$sanitisedDomainName_app" - assert_output --partial "nginx" } diff --git a/tests/integration/recipe_list.bats b/tests/integration/recipe_list.bats index ed2b7eb1..d1e1e1f7 100644 --- a/tests/integration/recipe_list.bats +++ b/tests/integration/recipe_list.bats @@ -5,13 +5,6 @@ setup() { _common_setup } -@test "recipe list" { - run $ABRA recipe list - assert_success - NUM_RECIPES=$(jq length "$ABRA_DIR/catalogue/recipes.json") - assert_output --partial "total recipes: $NUM_RECIPES" -} - @test "recipe list with pattern" { run $ABRA recipe list --pattern cloud assert_success