mirror of https://github.com/databricks/cli.git
added integration tests
This commit is contained in:
parent
b5f5f1103f
commit
a4879c0d91
|
@ -3,6 +3,7 @@ package fs
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"sort"
|
||||||
|
|
||||||
"github.com/databricks/cli/cmd/root"
|
"github.com/databricks/cli/cmd/root"
|
||||||
"github.com/databricks/cli/libs/cmdio"
|
"github.com/databricks/cli/libs/cmdio"
|
||||||
|
@ -59,6 +60,9 @@ var lsCmd = &cobra.Command{
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
lsOutputs = append(lsOutputs, *parsedEntry)
|
lsOutputs = append(lsOutputs, *parsedEntry)
|
||||||
|
sort.Slice(lsOutputs, func(i, j int) bool {
|
||||||
|
return lsOutputs[i].Name < lsOutputs[j].Name
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use template for long mode if the flag is set
|
// Use template for long mode if the flag is set
|
||||||
|
|
|
@ -241,7 +241,7 @@ func TestAccFilerWorkspaceFilesReadDir(t *testing.T) {
|
||||||
|
|
||||||
func temporaryDbfsDir(t *testing.T, w *databricks.WorkspaceClient) string {
|
func temporaryDbfsDir(t *testing.T, w *databricks.WorkspaceClient) string {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
path := fmt.Sprintf("/tmp/%s", RandomName("integration-test-filer-dbfs-"))
|
path := fmt.Sprintf("/tmp/%s", RandomName("integration-test-dbfs-"))
|
||||||
|
|
||||||
// This call fails if the path already exists.
|
// This call fails if the path already exists.
|
||||||
t.Logf("mkdir dbfs:%s", path)
|
t.Logf("mkdir dbfs:%s", path)
|
||||||
|
|
|
@ -1,2 +1,81 @@
|
||||||
package internal
|
package internal
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"io/fs"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
_ "github.com/databricks/cli/cmd/fs"
|
||||||
|
"github.com/databricks/cli/libs/filer"
|
||||||
|
"github.com/databricks/databricks-sdk-go"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFsLsForDbfs(t *testing.T) {
|
||||||
|
t.Log(GetEnvOrSkipTest(t, "CLOUD_ENV"))
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
w, err := databricks.NewWorkspaceClient()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
tmpDir := temporaryDbfsDir(t, w)
|
||||||
|
|
||||||
|
f, err := filer.NewDbfsClient(w, tmpDir)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
err = f.Mkdir(ctx, "a")
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = f.Write(ctx, "a/hello.txt", strings.NewReader("abc"), filer.CreateParentDirectories)
|
||||||
|
require.NoError(t, err)
|
||||||
|
err = f.Write(ctx, "bye.txt", strings.NewReader("def"))
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
stdout, stderr := RequireSuccessfulRun(t, "fs", "ls", "dbfs:"+tmpDir, "--output=json")
|
||||||
|
assert.Equal(t, "", stderr.String())
|
||||||
|
var parsedStdout []map[string]any
|
||||||
|
err = json.Unmarshal(stdout.Bytes(), &parsedStdout)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// assert on ls output
|
||||||
|
assert.Equal(t, "a", parsedStdout[0]["name"])
|
||||||
|
assert.Equal(t, true, parsedStdout[0]["is_directory"])
|
||||||
|
assert.Equal(t, float64(0), parsedStdout[0]["size"])
|
||||||
|
assert.Equal(t, "bye.txt", parsedStdout[1]["name"])
|
||||||
|
assert.Equal(t, false, parsedStdout[1]["is_directory"])
|
||||||
|
assert.Equal(t, float64(3), parsedStdout[1]["size"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFsLsForDbfsOnEmptyDir(t *testing.T) {
|
||||||
|
t.Log(GetEnvOrSkipTest(t, "CLOUD_ENV"))
|
||||||
|
|
||||||
|
w, err := databricks.NewWorkspaceClient()
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
tmpDir := temporaryDbfsDir(t, w)
|
||||||
|
|
||||||
|
stdout, stderr := RequireSuccessfulRun(t, "fs", "ls", "dbfs:"+tmpDir, "--output=json")
|
||||||
|
assert.Equal(t, "", stderr.String())
|
||||||
|
var parsedStdout []map[string]any
|
||||||
|
err = json.Unmarshal(stdout.Bytes(), &parsedStdout)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// assert on ls output
|
||||||
|
assert.Equal(t, 0, len(parsedStdout))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFsLsForDbfsForNonexistingDir(t *testing.T) {
|
||||||
|
t.Log(GetEnvOrSkipTest(t, "CLOUD_ENV"))
|
||||||
|
|
||||||
|
_, _, err := RequireErrorRun(t, "fs", "ls", "dbfs:/john-cena", "--output=json")
|
||||||
|
assert.ErrorIs(t, err, fs.ErrNotExist)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFsLsWithoutScheme(t *testing.T) {
|
||||||
|
t.Log(GetEnvOrSkipTest(t, "CLOUD_ENV"))
|
||||||
|
|
||||||
|
_, _, err := RequireErrorRun(t, "fs", "ls", "/ray-mysterio", "--output=json")
|
||||||
|
assert.ErrorContains(t, err, "expected dbfs path (with the dbfs:/ prefix): /ray-mysterio")
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue