Skip to content

Commit 916fd4d

Browse files
author
Chris Baker
committed
cleaned up some commented-out utility functions in test
1 parent cf43a06 commit 916fd4d

File tree

1 file changed

+2
-49
lines changed

1 file changed

+2
-49
lines changed

nomad/datasource_nomad_job_test.go

+2-49
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,14 @@ package nomad
22

33
import (
44
"fmt"
5-
"github.com/hashicorp/nomad/api"
65
"testing"
76

7+
"github.com/hashicorp/nomad/api"
8+
89
"github.com/hashicorp/terraform/helper/resource"
910
"github.com/hashicorp/terraform/terraform"
1011
)
1112

12-
//func cleanupTestJobAndNamespace(jobID, namespace string) resource.TestCheckFunc {
13-
// return func(*terraform.State) error {
14-
// providerConfig := testProvider.Meta().(ProviderConfig)
15-
// client := providerConfig.client
16-
// _, _, err := client.Jobs().Deregister(jobID, true, &api.WriteOptions{
17-
// Namespace: namespace,
18-
// })
19-
// if err != nil {
20-
// return fmt.Errorf("failed to clean up job %q after test: %s", jobID, err)
21-
// }
22-
// if namespace != "default" && namespace != "" {
23-
// _, err := client.Namespaces().Delete(namespace, nil)
24-
// if err != nil {
25-
// return fmt.Errorf("failed to clean up namespace %q after test: %s", namespace, err)
26-
// }
27-
// }
28-
// return nil
29-
// }
30-
//}
31-
//
32-
//func setupTestJobAndNamespace(job, namespace string) error {
33-
// client := testProvider.Meta().(ProviderConfig).client
34-
// fmt.Println("setupTestJobAndNamespace")
35-
// if namespace != "" && namespace != "default" {
36-
// _, err := client.Namespaces().Register(&api.Namespace{
37-
// Name: namespace,
38-
// }, nil)
39-
// if err != nil {
40-
// return fmt.Errorf("error creating test namespace: %s", err)
41-
// }
42-
// }
43-
// j, _ := client.Jobs().ParseHCL(testJobHCL(job, namespace), false)
44-
// _, _, err := client.Jobs().Register(j, nil)
45-
// if err != nil {
46-
// return fmt.Errorf("error creating test job: %s", err)
47-
// }
48-
// return nil
49-
//}
50-
5113
func TestAccDataSourceNomadJob_Basic(t *testing.T) {
5214
job := "testjobds"
5315
resource.Test(t, resource.TestCase{
@@ -69,11 +31,6 @@ func TestAccDataSourceNomadJob_Basic(t *testing.T) {
6931
"data.nomad_job.test-job", "namespace", "default"),
7032
),
7133
},
72-
//{
73-
// Config: testAccCheckDataSourceNomadJobConfigErr,
74-
// Destroy: false,
75-
// ExpectError: regexp.MustCompile(`.*job not found`),
76-
//},
7734
},
7835
})
7936
}
@@ -100,10 +57,6 @@ func TestAccDataSourceNomadJob_Namespaced(t *testing.T) {
10057
"data.nomad_job.test-job", "namespace", ns),
10158
),
10259
},
103-
//{
104-
// Config: testAccCheckDataSourceNomadJobWrongNamespace,
105-
// ExpectError: regexp.MustCompile(`.*job not found`),
106-
//},
10760
},
10861
})
10962
}

0 commit comments

Comments
 (0)