Skip to content

Commit 2645ddc

Browse files
committed
Remove isolation of conformance tests
1 parent f3deda0 commit 2645ddc

2 files changed

Lines changed: 17 additions & 25 deletions

File tree

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ test: deps
2323
test-acceptance: deps
2424
TF_ACC=1 go test -v -mod=readonly -count=1 -p 1 -parallel 10 ./...
2525

26-
test-conformance: deps
27-
TF_ACC=1 go test -v -short -mod=readonly -count=1 -p 1 -parallel 10 ./...
28-
2926
check-docs: doc
3027
git diff --exit-code -- docs
3128

pkg/framework/objects/repository/resource_acceptance_test.go

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,28 +106,23 @@ func TestAccDbtCloudRepositoryResource(t *testing.T) {
106106
},
107107
})
108108

109-
// This could be done in the opposite way, where running with 'go test -short' would skip
110-
// the conformance tests. However, we should aim to only run conformance tests when we need to
111-
if testing.Short() {
112-
t.Log("Running conformance tests")
113-
resource.Test(t, resource.TestCase{
114-
PreCheck: func() { acctest_helper.TestAccPreCheck(t) },
115-
CheckDestroy: testAccCheckDbtCloudRepositoryDestroy,
116-
Steps: []resource.TestStep{
117-
acctest_helper.MakeExternalProviderTestStep(createByDeployKeyTestStep, acctest_config.LAST_VERSION_BEFORE_FRAMEWORK_MIGRATION),
118-
acctest_helper.MakeCurrentProviderNoOpTestStep(createByDeployKeyTestStep),
119-
},
120-
})
121-
122-
resource.Test(t, resource.TestCase{
123-
PreCheck: func() { acctest_helper.TestAccPreCheck(t) },
124-
CheckDestroy: testAccCheckDbtCloudRepositoryDestroy,
125-
Steps: []resource.TestStep{
126-
acctest_helper.MakeExternalProviderTestStep(createByCloneTestStep, acctest_config.LAST_VERSION_BEFORE_FRAMEWORK_MIGRATION),
127-
acctest_helper.MakeCurrentProviderNoOpTestStep(createByCloneTestStep),
128-
},
129-
})
130-
}
109+
resource.Test(t, resource.TestCase{
110+
PreCheck: func() { acctest_helper.TestAccPreCheck(t) },
111+
CheckDestroy: testAccCheckDbtCloudRepositoryDestroy,
112+
Steps: []resource.TestStep{
113+
acctest_helper.MakeExternalProviderTestStep(createByDeployKeyTestStep, acctest_config.LAST_VERSION_BEFORE_FRAMEWORK_MIGRATION),
114+
acctest_helper.MakeCurrentProviderNoOpTestStep(createByDeployKeyTestStep),
115+
},
116+
})
117+
118+
resource.Test(t, resource.TestCase{
119+
PreCheck: func() { acctest_helper.TestAccPreCheck(t) },
120+
CheckDestroy: testAccCheckDbtCloudRepositoryDestroy,
121+
Steps: []resource.TestStep{
122+
acctest_helper.MakeExternalProviderTestStep(createByCloneTestStep, acctest_config.LAST_VERSION_BEFORE_FRAMEWORK_MIGRATION),
123+
acctest_helper.MakeCurrentProviderNoOpTestStep(createByCloneTestStep),
124+
},
125+
})
131126
}
132127

133128
func testAccDbtCloudRepositoryResourceGithubConfig(repoUrl, projectName string) string {

0 commit comments

Comments
 (0)