Merge pull request #422 from pixlise/feature/client

Took out unfinished testJobs() from integration test

Author: pnemere

internal/cmd-line-tools/api-integration-test/main.go

@@ -171,7 +171,7 @@ func runLocalTests(apiHost string, isCI bool) {
 	//return
 
 	// *** NOT RUNNING THIS LOCALLY, NO LAMBDA IS STARTED *** testScanImport(apiHost)
-	testJobs(apiHost)
+	//testJobs(apiHost)
 	u1Id, u2Id := testNotification(apiHost)
 	testImageUpload(apiHost, u1Id, u2Id)
 	testImageMatchTransform(apiHost)

internal/cmd-line-tools/api-integration-test/testJobs.go

@@ -28,8 +28,8 @@ func testJobs(apiHost string) {
 	})
 
 	u1.AddSendReqAction("List jobs, should be empty",
-		`{"scanJobListReq":{}}`,
-		`{"msgId":1,"status":"WS_OK","scanJobListResp":{"jobs": []}}`,
+		`{"scanListJobsReq":{}}`,
+		`{"msgId":1,"status":"WS_OK","scanListJobsResp":{"jobs": []}}`,
 	)
 
 	u1.AddSendReqAction("Create job1",
@@ -43,8 +43,8 @@ func testJobs(apiHost string) {
 	)
 
 	u1.AddSendReqAction("List jobs, should be 2",
-		`{"scanJobListReq":{}}`,
-		`{"msgId":1,"status":"WS_OK","scanJobListResp":{"jobs": []}}`,
+		`{"scanListJobsReq":{}}`,
+		`{"msgId":1,"status":"WS_OK","scanListJobsResp":{"jobs": []}}`,
 	)
 
 	u1.AddSendReqAction("Delete job1",
@@ -53,8 +53,8 @@ func testJobs(apiHost string) {
 	)
 
 	u1.AddSendReqAction("List jobs, should be 2",
-		`{"scanJobListReq":{}}`,
-		`{"msgId":1,"status":"WS_OK","scanJobListResp":{"jobs": []}}`,
+		`{"scanListJobsReq":{}}`,
+		`{"msgId":1,"status":"WS_OK","scanListJobsResp":{"jobs": []}}`,
 	)
 
 	u1.AddSendReqAction("Trigger non-existant job",