add regression test + go fmt
diff --git a/server_test.go b/server_test.go
index 8612b3f..f67b8fb 100644
--- a/server_test.go
+++ b/server_test.go
@@ -90,6 +90,27 @@
}
+func TestCommit(t *testing.T) {
+ runtime := mkRuntime(t)
+ defer nuke(runtime)
+
+ srv := &Server{runtime: runtime}
+
+ config, _, _, err := ParseRun([]string{GetTestImage(runtime).ID, "/bin/cat"}, nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ id, err := srv.ContainerCreate(config)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ if _, err := srv.ContainerCommit(id, "testrepo", "testtag", "", "", config); err != nil {
+ t.Fatal(err)
+ }
+}
+
func TestCreateStartRestartStopStartKillRm(t *testing.T) {
runtime := mkRuntime(t)
defer nuke(runtime)
diff --git a/utils/utils.go b/utils/utils.go
index acb015b..c70e80b 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -611,11 +611,11 @@
Status string `json:"status,omitempty"`
Progress string `json:"progress,omitempty"`
Error string `json:"error,omitempty"`
- ID string `json:"id,omitempty"`
- Time int64 `json:"time,omitempty"`
+ ID string `json:"id,omitempty"`
+ Time int64 `json:"time,omitempty"`
}
-func (jm *JSONMessage) Display(out io.Writer) (error) {
+func (jm *JSONMessage) Display(out io.Writer) error {
if jm.Time != 0 {
fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))
}
@@ -631,7 +631,6 @@
return nil
}
-
type StreamFormatter struct {
json bool
used bool