Merge pull request #74 from aws/fix/failed-e2e-tests

Fix failed e2e tests

Author: wongni

pkg/cloud/cluster.go

@@ -129,9 +129,12 @@ func (c *client) ResolveDomainAndAccount(csCluster *infrav1.CloudStackCluster) e
 		listAccountResp, retErr := c.cs.Account.ListAccounts(listAccountParams)
 		if retErr != nil {
 			return retErr
-		} else if listAccountResp.Count != 1 {
+		} else if listAccountResp.Count == 0 {
+			return errors.Errorf("could not find account %s in domain ID %s",
+				csCluster.Spec.Account, csCluster.Status.DomainID)
+		} else if listAccountResp.Count > 1 {
 			return errors.Errorf("expected 1 Account with account name %s in domain ID %s, but got %d",
-				csCluster.Spec.Account, csCluster.Status.DomainID, resp.Count)
+				csCluster.Spec.Account, csCluster.Status.DomainID, listAccountResp.Count)
 		}
 	}
 	return nil

test/e2e/invalid_resource.go

@@ -66,7 +66,7 @@ func InvalidResourceSpec(ctx context.Context, inputGetter func() CommonSpecInput
 	})
 
 	It("Should fail due to the specified domain is not found [TC4b]", func() {
-		testInvalidResource(ctx, input, "invalid-domain", "No match found for "+input.E2EConfig.GetVariable(InvalidDomainName))
+		testInvalidResource(ctx, input, "invalid-domain", "domain not found for domain path "+input.E2EConfig.GetVariable(InvalidDomainName))
 	})
 
 	It("Should fail due to the specified control plane offering is not found [TC7]", func() {