Skip to content

Commit

Permalink
migrate internal testsuite to v2 path
Browse files Browse the repository at this point in the history
  • Loading branch information
@tedim52
tedim52 committed Jan 18, 2025
1 parent 408a21a commit d5cdc6c
Show file tree
Hide file tree
Showing 28 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions internal_testsuites/golang/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite
go 1.20

replace (
github.com/kurtosis-tech/kurtosis/api/golang => ../../api/golang
github.com/kurtosis-tech/kurtosis/api/golang/v2 => ../../api/golang
github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang => ../../grpc-file-transfer/golang
github.com/kurtosis-tech/kurtosis/path-compression => ./../../path-compression
)
Expand All @@ -12,7 +12,6 @@ require (
github.com/golang/protobuf v1.5.3
github.com/kurtosis-tech/example-api-server/api/golang v0.0.0-20211207020812-00a54fc29318
github.com/kurtosis-tech/example-datastore-server/api/golang v0.0.0-20211207020830-504dbf5ed1a6
github.com/kurtosis-tech/kurtosis/api/golang v0.0.0 // local dependency
github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
Expand All @@ -21,6 +20,7 @@ require (
)

require (
github.com/kurtosis-tech/kurtosis/api/golang/v2 v2.0.0-pre.1
github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20240307154559-64d2929cd265
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
Expand Down
4 changes: 2 additions & 2 deletions internal_testsuites/golang/test_helpers/enclave_setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/util"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/util"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
Expand Down
10 changes: 5 additions & 5 deletions internal_testsuites/golang/test_helpers/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (
"testing"
"time"

"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"

"github.com/golang/protobuf/ptypes/empty"
"github.com/kurtosis-tech/example-api-server/api/golang/example_api_server_rpc_api_bindings"
"github.com/kurtosis-tech/example-api-server/api/golang/example_api_server_rpc_api_consts"
"github.com/kurtosis-tech/example-datastore-server/api/golang/datastore_rpc_api_bindings"
"github.com/kurtosis-tech/example-datastore-server/api/golang/datastore_rpc_api_consts"
"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion ..._testsuites/golang/testsuite/basic_datastore_and_api_test/basic_datastore_and_api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"github.com/kurtosis-tech/example-api-server/api/golang/example_api_server_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion internal_testsuites/golang/testsuite/basic_datastore_test/basic_datastore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"github.com/kurtosis-tech/example-datastore-server/api/golang/datastore_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion internal_testsuites/golang/testsuite/destroy_enclave_test/destroy_enclave_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package destroy_enclave_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/stretchr/testify/require"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion ...ng/testsuite/enclave_and_service_identifiers_test/enclave_and_service_identifiers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package identifiers_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
4 changes: 2 additions & 2 deletions internal_testsuites/golang/testsuite/persisted_logs_test/persisted_logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package persisted_logs_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context"
"github.com/stretchr/testify/require"
"testing"
"time"
Expand Down
4 changes: 2 additions & 2 deletions internal_testsuites/golang/testsuite/search_logs_test/search_logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package search_logs_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context"
"github.com/stretchr/testify/require"
"testing"
"time"
Expand Down
4 changes: 2 additions & 2 deletions ...ck-local-absolute-locators_test/startosis_block_local_absolute_locators_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package startosis_block_local_absolute_locators

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"os"
"path"
"testing"

"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion ...suites/golang/testsuite/startosis_add_service_test/startosis_add_service_port_url_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package startosis_add_service_test

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"k8s.io/utils/strings/slices"
Expand Down
2 changes: 1 addition & 1 deletion ...rnal_testsuites/golang/testsuite/startosis_add_service_test/startosis_add_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package startosis_add_service_test

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"k8s.io/utils/strings/slices"
Expand Down
2 changes: 1 addition & 1 deletion ...uites/golang/testsuite/startosis_add_service_test/startosis_add_service_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_add_service_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion ...te/startosis_add_service_with_port_spec_test/startosis_add_service_with_port_spec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_add_service_with_port_spec_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
4 changes: 2 additions & 2 deletions ...estsuites/golang/testsuite/startosis_directory_test/startosis_directory_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package startosis_directory_test

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"os"
"path"
"testing"

"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
6 changes: 3 additions & 3 deletions ...rnal_testsuites/golang/testsuite/startosis_idempotency_test/no_instruction_cached_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/stretchr/testify/require"
"testing"
)
Expand Down
4 changes: 2 additions & 2 deletions ...al_testsuites/golang/testsuite/startosis_package_test/startosis_package_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package startosis_package_test

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"os"
"path"
"testing"

"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion ...tsuites/golang/testsuite/startosis_ports_wait_test/startosis_ports_wait_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_ports_wait_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion ...estsuites/golang/testsuite/startosis_remote_package_test/startosis_remote_package_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_remote_package_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
4 changes: 2 additions & 2 deletions ...al_testsuites/golang/testsuite/startosis_replace_test/startosis_replace_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package startosis_replace_test

import (
"context"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"os"
"path"
"testing"

"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion ...tsuite/startosis_request_wait_assert_test/startosis_request_wait_assert_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_request_wait_assert_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
4 changes: 2 additions & 2 deletions ...tsuites/golang/testsuite/startosis_subpackage_test/startosis_subpackage_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package startosis_subpackage_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion internal_testsuites/golang/testsuite/startosis_test/startosis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package startosis_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"testing"
Expand Down
2 changes: 1 addition & 1 deletion ...rnal_testsuites/golang/testsuite/startosis_upload_file_test/startosis_upload_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/hex"
"fmt"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"os"
Expand Down
4 changes: 2 additions & 2 deletions ...uites/golang/testsuite/startosis_upload_file_test/startosis_upload_file_testsuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package startosis_upload_file_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/starlark_run_config"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/enclaves"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/starlark_run_config"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion internal_testsuites/golang/testsuite/store_web_files_test/store_web_files_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions internal_testsuites/golang/testsuite/stream_logs_test/stream_logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package stream_logs_test
import (
"context"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/engine/lib/kurtosis_context"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/engine/lib/kurtosis_context"
"github.com/stretchr/testify/require"
"testing"
"time"
Expand Down
4 changes: 2 additions & 2 deletions internal_testsuites/golang/testsuite/upload_download_files_test/upload_download_file_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"crypto/md5"
"fmt"
"github.com/kurtosis-tech/kurtosis-cli/golang_internal_testsuite/test_helpers"
"github.com/kurtosis-tech/kurtosis/api/golang/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/core/lib/services"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/kurtosis_core_rpc_api_bindings"
"github.com/kurtosis-tech/kurtosis/api/golang/v2/core/lib/services"
"github.com/kurtosis-tech/kurtosis/path-compression"
"github.com/kurtosis-tech/stacktrace"
"github.com/sirupsen/logrus"
Expand Down

0 comments on commit d5cdc6c

Please sign in to comment.