Object Storage v1: Fixing unit test. Changing Timestamp parsing method

jtopjian · jtopjian · commit 1097a7d684ea · 2021-06-30T16:41:34.000Z
diff --git a/openstack/objectstorage/v1/containers/results.go b/openstack/objectstorage/v1/containers/results.go
@@ -3,7 +3,6 @@ package containers
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
@@ -105,17 +104,16 @@ type GetHeader struct {
 	StoragePolicy    string    `json:"X-Storage-Policy"`
 	TempURLKey       string    `json:"X-Container-Meta-Temp-URL-Key"`
 	TempURLKey2      string    `json:"X-Container-Meta-Temp-URL-Key-2"`
-	Timestamp        float64   `json:"-"`
+	Timestamp        float64   `json:"X-Timestamp,string"`
 }
 
 func (r *GetHeader) UnmarshalJSON(b []byte) error {
 	type tmp GetHeader
 	var s struct {
 		tmp
-		Write     string                  `json:"X-Container-Write"`
-		Read      string                  `json:"X-Container-Read"`
-		Date      gophercloud.JSONRFC1123 `json:"Date"`
-		Timestamp string                  `json:"X-Timestamp"`
+		Write string                  `json:"X-Container-Write"`
+		Read  string                  `json:"X-Container-Read"`
+		Date  gophercloud.JSONRFC1123 `json:"Date"`
 	}
 
 	err := json.Unmarshal(b, &s)
@@ -130,11 +128,6 @@ func (r *GetHeader) UnmarshalJSON(b []byte) error {
 
 	r.Date = time.Time(s.Date)
 
-	r.Timestamp, err = strconv.ParseFloat(s.Timestamp, 64)
-	if err != nil {
-		return err
-	}
-
 	return err
 }
 
diff --git a/openstack/objectstorage/v1/containers/testing/requests_test.go b/openstack/objectstorage/v1/containers/testing/requests_test.go
@@ -157,6 +157,7 @@ func TestGetContainer(t *testing.T) {
 		TransID:       "tx554ed59667a64c61866f1-0057b4ba37",
 		Write:         []string{"test2", "user4"},
 		StoragePolicy: "test_policy",
+		Timestamp:     1471298837.95721,
 	}
 	actual, err := res.Extract()
 	th.AssertNoErr(t, err)

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ func TestGetContainer(t *testing.T) {`
`157`	`157`	`TransID: "tx554ed59667a64c61866f1-0057b4ba37",`
`158`	`158`	`Write: []string{"test2", "user4"},`
`159`	`159`	`StoragePolicy: "test_policy",`
	`160`	`+ Timestamp: 1471298837.95721,`
`160`	`161`	`}`
`161`	`162`	`actual, err := res.Extract()`
`162`	`163`	`th.AssertNoErr(t, err)`