diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-10-09 09:13:22 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-10-13 17:28:45 -0700 |
| commit | eb4a746efcb9e76e29942461b97da797fd67109f (patch) | |
| tree | 980663ba01f79bd107980fd0c3205fe833503a41 /cmd/podman/parse | |
| parent | 7ad631b819d991559ba20e4728a6803a2546158f (diff) | |
| download | podman-eb4a746efcb9e76e29942461b97da797fd67109f.tar.gz podman-eb4a746efcb9e76e29942461b97da797fd67109f.tar.bz2 podman-eb4a746efcb9e76e29942461b97da797fd67109f.zip | |
Restore --format table support
* system df
* events
* fix error handling from go routine
* update tests to use gomega matchers for better error messages
* system info
* version
* volume inspect
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/parse')
| -rw-r--r-- | cmd/podman/parse/json.go | 2 | ||||
| -rw-r--r-- | cmd/podman/parse/json_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/parse/json.go b/cmd/podman/parse/json.go index 40ac415db..d7486d0b1 100644 --- a/cmd/podman/parse/json.go +++ b/cmd/podman/parse/json.go @@ -2,7 +2,7 @@ package parse import "regexp" -var jsonFormatRegex = regexp.MustCompile(`^\s*(json|{{\s*json\s*( \.)?\s*}})\s*$`) +var jsonFormatRegex = regexp.MustCompile(`^\s*(json|{{\s*json\s*(\.)?\s*}})\s*$`) // MatchesJSONFormat test CLI --format string to be a JSON request func MatchesJSONFormat(s string) bool { diff --git a/cmd/podman/parse/json_test.go b/cmd/podman/parse/json_test.go index ec3b5664b..b3b29c93c 100644 --- a/cmd/podman/parse/json_test.go +++ b/cmd/podman/parse/json_test.go @@ -27,7 +27,7 @@ func TestMatchesJSONFormat(t *testing.T) { {"json . }}", false}, {"{{.ID }} json .", false}, {"json .", false}, - {"{{json.}}", false}, + {"{{json.}}", true}, } for _, tt := range tests { |