Skip to content

Move integration and e2e tests for epp into epp-specific directories #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Move integration and e2e tests for epp into epp-specific directories #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 test/e2e/README.md → test/e2e/epp/README.md
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions test/e2e/e2e_suite_test.go → test/e2e/epp/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package e2e
package epp

import (
"context"
Expand Down Expand Up @@ -67,19 +67,19 @@ const (
// inferExtName is the name of the inference extension test resources.
inferExtName = "inference-gateway-ext-proc"
// clientManifest is the manifest for the client test resources.
clientManifest = "../testdata/client.yaml"
clientManifest = "../../testdata/client.yaml"
// modelServerManifest is the manifest for the model server test resources.
modelServerManifest = "../../config/manifests/vllm/gpu-deployment.yaml"
modelServerManifest = "../../../config/manifests/vllm/gpu-deployment.yaml"
// modelServerSecretManifest is the manifest for the model server secret resource.
modelServerSecretManifest = "../testdata/model-secret.yaml"
modelServerSecretManifest = "../../testdata/model-secret.yaml"
// inferPoolManifest is the manifest for the inference pool CRD.
inferPoolManifest = "../../config/crd/bases/inference.networking.x-k8s.io_inferencepools.yaml"
inferPoolManifest = "../../../config/crd/bases/inference.networking.x-k8s.io_inferencepools.yaml"
// inferModelManifest is the manifest for the inference model CRD.
inferModelManifest = "../../config/crd/bases/inference.networking.x-k8s.io_inferencemodels.yaml"
inferModelManifest = "../../../config/crd/bases/inference.networking.x-k8s.io_inferencemodels.yaml"
// inferExtManifest is the manifest for the inference extension test resources.
inferExtManifest = "../../config/manifests/ext_proc.yaml"
inferExtManifest = "../../../config/manifests/ext_proc.yaml"
// envoyManifest is the manifest for the envoy proxy test resources.
envoyManifest = "../testdata/envoy.yaml"
envoyManifest = "../../testdata/envoy.yaml"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/e2e_test.go → test/e2e/epp/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package e2e
package epp

import (
"fmt"
Expand Down
8 changes: 4 additions & 4 deletions test/integration/hermetic_test.go → test/integration/epp/hermetic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package test contains e2e tests for the ext proc while faking the backend pods.
package integration
// Package epp contains integration tests for the ext proc while faking the backend pods.
package epp

import (
"bufio"
Expand Down Expand Up @@ -472,7 +472,7 @@ func setUpHermeticServer(t *testing.T, podMetrics []*datastore.PodMetrics) (clie
func BeforeSuit(t *testing.T) func() {
// Set up mock k8s API Client
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
ErrorIfCRDPathMissing: true,
}
cfg, err := testEnv.Start()
Expand Down Expand Up @@ -522,7 +522,7 @@ func BeforeSuit(t *testing.T) func() {
logger.Info("Setting up hermetic ExtProc server")

// Unmarshal CRDs from file into structs
manifestsPath := filepath.Join("..", "testdata", "inferencepool-with-model-hermetic.yaml")
manifestsPath := filepath.Join("..", "..", "testdata", "inferencepool-with-model-hermetic.yaml")
docs, err := readDocuments(manifestsPath)
if err != nil {
logutil.Fatal(logger, err, "Can't read object manifests", "path", manifestsPath)
Expand Down