Merge lp:~jtv/gwacl/newteststoragecontext-endpoint into lp:gwacl

[Jeroen T. Vermeulen]

Set AzureEndpoint in NewTestStorageContext.

This makes life a bit easier for third-party tests, because that endpoint is now required. This way, tests that didn't set the endpoint have a fighting chance. (The actual URL may not be what they were used to, but that variability is more or less inevitable now that we support both of the real-world Azure's endpoints).

Jeroen

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'testing.go'
--- testing.go	2013-07-08 10:03:48 +0000
+++ testing.go	2013-08-07 06:45:37 +0000
@@ -14,6 +14,7 @@
 func NewTestStorageContext(client *http.Client) *StorageContext {
     storageContext := &StorageContext{}
     storageContext.client = client
+    storageContext.AzureEndpoint = "http://127.0.0.1/"
     return storageContext
 }
 

=== modified file 'testing_test.go'
--- testing_test.go	2013-08-06 11:11:50 +0000
+++ testing_test.go	2013-08-07 06:45:37 +0000
@@ -13,19 +13,27 @@
 
 var _ = Suite(&testTesting{})
 
-func (suite *testTesting) TestNewTestStorageContext(c *C) {
+func (*testTesting) TestNewTestStorageContextCreatesCompleteContext(c *C) {
+    client := &http.Client{Transport: &TestTransport{}}
+    context := NewTestStorageContext(client)
+    context.Account = "myaccount"
+
+    c.Check(context.Account, Equals, "myaccount")
+    c.Check(context.getAccountURL(), Matches, ".*myaccount.*")
+}
+
+func (*testTesting) TestNewTestStorageContextWorksWithTransport(c *C) {
     errorMessage := "canned-error"
     error := fmt.Errorf(errorMessage)
     transport := &TestTransport{Error: error}
     client := &http.Client{Transport: transport}
     context := NewTestStorageContext(client)
-    context.AzureEndpoint = "http://example.com/"
     request := &ListContainersRequest{Marker: ""}
     _, err := context.ListContainers(request)
     c.Check(err, ErrorMatches, ".*"+errorMessage+".*")
 }
 
-func (suite *testTesting) TestNewDispatcherResponse(c *C) {
+func (*testTesting) TestNewDispatcherResponse(c *C) {
     body := []byte("test body")
     statusCode := http.StatusOK
     errorObject := fmt.Errorf("canned-error")
@@ -35,7 +43,7 @@
     c.Check(dispatcherResponse.response.StatusCode, Equals, statusCode)
 }
 
-func (suite *testTesting) TestPatchManagementAPIResponses(c *C) {
+func (*testTesting) TestPatchManagementAPIResponses(c *C) {
     response := NewDispatcherResponse([]byte("<Images></Images>"), http.StatusOK, nil)
     responses := []DispatcherResponse{response, response}
     requests := PatchManagementAPIResponses(responses)