Move bundle tests into bundle/tests (#1299)

## Changes These tests were located in `bundle/tests/bundle` which meant they were unable to reuse the helper functions defined in the `bundle/tests` package. There is no need for these tests to live outside the package. ## Tests Existing tests pass.
databricks · Mar 21, 2024 · f202596 · f202596
1 parent 0ef93c2
commit f202596
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 38 deletions.
diff --git a/bundle/tests/bundle/loader.go b/bundle/tests/bundle/loader.go
diff --git a/...bundle/pipeline_glob_paths/databricks.yml → .../tests/pipeline_glob_paths/databricks.yml b/...bundle/pipeline_glob_paths/databricks.yml → .../tests/pipeline_glob_paths/databricks.yml
diff --git a/...ipeline_glob_paths/dlt/nyc_taxi_loader.py → ...ipeline_glob_paths/dlt/nyc_taxi_loader.py b/...ipeline_glob_paths/dlt/nyc_taxi_loader.py → ...ipeline_glob_paths/dlt/nyc_taxi_loader.py
diff --git a/.../tests/bundle/pipeline_glob_paths_test.go → bundle/tests/pipeline_glob_paths_test.go b/.../tests/bundle/pipeline_glob_paths_test.go → bundle/tests/pipeline_glob_paths_test.go
@@ -1,4 +1,4 @@
-package bundle
+package config_tests
 
 import (
 	"context"

diff --git a/bundle/tests/bundle/python_wheel/.gitignore → ...ests/python_wheel/python_wheel/.gitignore b/bundle/tests/bundle/python_wheel/.gitignore → ...ests/python_wheel/python_wheel/.gitignore
diff --git a/bundle/tests/bundle/python_wheel/bundle.yml → ...ests/python_wheel/python_wheel/bundle.yml b/bundle/tests/bundle/python_wheel/bundle.yml → ...ests/python_wheel/python_wheel/bundle.yml
diff --git a/...bundle/python_wheel/my_test_code/setup.py → ..._wheel/python_wheel/my_test_code/setup.py b/...bundle/python_wheel/my_test_code/setup.py → ..._wheel/python_wheel/my_test_code/setup.py
diff --git a/...python_wheel/my_test_code/src/__init__.py → ...python_wheel/my_test_code/src/__init__.py b/...python_wheel/my_test_code/src/__init__.py → ...python_wheel/my_test_code/src/__init__.py
diff --git a/...python_wheel/my_test_code/src/__main__.py → ...python_wheel/my_test_code/src/__main__.py b/...python_wheel/my_test_code/src/__main__.py → ...python_wheel/my_test_code/src/__main__.py
diff --git a/...s/bundle/python_wheel_dbfs_lib/bundle.yml → ...on_wheel/python_wheel_dbfs_lib/bundle.yml b/...s/bundle/python_wheel_dbfs_lib/bundle.yml → ...on_wheel/python_wheel_dbfs_lib/bundle.yml
diff --git a/...undle/python_wheel_no_artifact/.gitignore → ...wheel/python_wheel_no_artifact/.gitignore b/...undle/python_wheel_no_artifact/.gitignore → ...wheel/python_wheel_no_artifact/.gitignore
diff --git a/...undle/python_wheel_no_artifact/bundle.yml → ...wheel/python_wheel_no_artifact/bundle.yml b/...undle/python_wheel_no_artifact/bundle.yml → ...wheel/python_wheel_no_artifact/bundle.yml
diff --git a/...heel_no_artifact/my_test_code/__init__.py → ...heel_no_artifact/my_test_code/__init__.py b/...heel_no_artifact/my_test_code/__init__.py → ...heel_no_artifact/my_test_code/__init__.py
diff --git a/...heel_no_artifact/my_test_code/__main__.py → ...heel_no_artifact/my_test_code/__main__.py b/...heel_no_artifact/my_test_code/__main__.py → ...heel_no_artifact/my_test_code/__main__.py
diff --git a/.../bundle/python_wheel_no_artifact/setup.py → ...n_wheel/python_wheel_no_artifact/setup.py b/.../bundle/python_wheel_no_artifact/setup.py → ...n_wheel/python_wheel_no_artifact/setup.py
diff --git a/...hon_wheel_no_artifact_no_setup/.gitignore → ...hon_wheel_no_artifact_no_setup/.gitignore b/...hon_wheel_no_artifact_no_setup/.gitignore → ...hon_wheel_no_artifact_no_setup/.gitignore
diff --git a/...hon_wheel_no_artifact_no_setup/bundle.yml → ...hon_wheel_no_artifact_no_setup/bundle.yml b/...hon_wheel_no_artifact_no_setup/bundle.yml → ...hon_wheel_no_artifact_no_setup/bundle.yml
diff --git a/...ckage/my_test_code-0.0.1-py3-none-any.whl → ...ckage/my_test_code-0.0.1-py3-none-any.whl b/...ckage/my_test_code-0.0.1-py3-none-any.whl → ...ckage/my_test_code-0.0.1-py3-none-any.whl
diff --git a/bundle/tests/bundle/wheel_test.go → bundle/tests/python_wheel_test.go b/bundle/tests/bundle/wheel_test.go → bundle/tests/python_wheel_test.go
@@ -1,4 +1,4 @@
-package bundle
+package config_tests
 
 import (
 	"context"
@@ -11,16 +11,16 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestBundlePythonWheelBuild(t *testing.T) {
+func TestPythonWheelBuild(t *testing.T) {
 	ctx := context.Background()
-	b, err := bundle.Load(ctx, "./python_wheel")
+	b, err := bundle.Load(ctx, "./python_wheel/python_wheel")
 	require.NoError(t, err)
 
 	m := phases.Build()
 	err = bundle.Apply(ctx, b, m)
 	require.NoError(t, err)
 
-	matches, err := filepath.Glob("python_wheel/my_test_code/dist/my_test_code-*.whl")
+	matches, err := filepath.Glob("./python_wheel/python_wheel/my_test_code/dist/my_test_code-*.whl")
 	require.NoError(t, err)
 	require.Equal(t, 1, len(matches))
 
@@ -29,16 +29,16 @@ func TestBundlePythonWheelBuild(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestBundlePythonWheelBuildAutoDetect(t *testing.T) {
+func TestPythonWheelBuildAutoDetect(t *testing.T) {
 	ctx := context.Background()
-	b, err := bundle.Load(ctx, "./python_wheel_no_artifact")
+	b, err := bundle.Load(ctx, "./python_wheel/python_wheel_no_artifact")
 	require.NoError(t, err)
 
 	m := phases.Build()
 	err = bundle.Apply(ctx, b, m)
 	require.NoError(t, err)
 
-	matches, err := filepath.Glob("python_wheel/my_test_code/dist/my_test_code-*.whl")
+	matches, err := filepath.Glob("./python_wheel/python_wheel_no_artifact/dist/my_test_code-*.whl")
 	require.NoError(t, err)
 	require.Equal(t, 1, len(matches))
 
@@ -47,9 +47,9 @@ func TestBundlePythonWheelBuildAutoDetect(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestBundlePythonWheelWithDBFSLib(t *testing.T) {
+func TestPythonWheelWithDBFSLib(t *testing.T) {
 	ctx := context.Background()
-	b, err := bundle.Load(ctx, "./python_wheel_dbfs_lib")
+	b, err := bundle.Load(ctx, "./python_wheel/python_wheel_dbfs_lib")
 	require.NoError(t, err)
 
 	m := phases.Build()
@@ -61,9 +61,9 @@ func TestBundlePythonWheelWithDBFSLib(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestBundlePythonWheelBuildNoBuildJustUpload(t *testing.T) {
+func TestPythonWheelBuildNoBuildJustUpload(t *testing.T) {
 	ctx := context.Background()
-	b, err := bundle.Load(ctx, "./python_wheel_no_artifact_no_setup")
+	b, err := bundle.Load(ctx, "./python_wheel/python_wheel_no_artifact_no_setup")
 	require.NoError(t, err)
 
 	m := phases.Build()