Skip to content

Commit c346f67

Browse files
committed
update tests for new struct
1 parent 4a0b026 commit c346f67

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

test/e2e/bind/happy-case_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ spec:
109109
iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams()
110110
authURLDryRunCh := make(chan string, 1)
111111
go simulateBrowser(t, authURLDryRunCh, serviceGVR.Resource)
112-
framework.Bind(t, iostreams, authURLDryRunCh, nil, fmt.Sprintf("http://%s/export", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector", "--dry-run")
112+
framework.Bind(t, iostreams, authURLDryRunCh, nil, fmt.Sprintf("http://%s/clusters/-/exports", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector", "--dry-run")
113113
_, err := yaml.YAMLToJSON(bufOut.Bytes())
114114
require.NoError(t, err)
115115
},
@@ -121,7 +121,7 @@ spec:
121121
authURLCh := make(chan string, 1)
122122
go simulateBrowser(t, authURLCh, serviceGVR.Resource)
123123
invocations := make(chan framework.SubCommandInvocation, 1)
124-
framework.Bind(t, iostreams, authURLCh, invocations, fmt.Sprintf("http://%s/export", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector")
124+
framework.Bind(t, iostreams, authURLCh, invocations, fmt.Sprintf("http://%s/clusters/-/exports", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector")
125125
inv := <-invocations
126126
requireEqualSlicePattern(t, []string{"apiservice", "--remote-kubeconfig-namespace", "*", "--remote-kubeconfig-name", "*", "-f", "-", "--kubeconfig=" + consumerKubeconfig, "--skip-konnector=true", "--no-banner"}, inv.Args)
127127
framework.BindAPIService(t, inv.Stdin, "", inv.Args...)
@@ -347,7 +347,7 @@ spec:
347347
authURLCh := make(chan string, 1)
348348
go simulateBrowser(t, authURLCh, serviceGVR.Resource)
349349
invocations := make(chan framework.SubCommandInvocation, 1)
350-
framework.Bind(t, iostreams, authURLCh, invocations, fmt.Sprintf("http://%s/export", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector")
350+
framework.Bind(t, iostreams, authURLCh, invocations, fmt.Sprintf("http://%s/clusters/-/exports", addr.String()), "--kubeconfig", consumerKubeconfig, "--skip-konnector")
351351
inv := <-invocations
352352
requireEqualSlicePattern(t, []string{"apiservice", "--remote-kubeconfig-namespace", "*", "--remote-kubeconfig-name", "*", "-f", "-", "--kubeconfig=" + consumerKubeconfig, "--skip-konnector=true", "--no-banner"}, inv.Args)
353353
framework.BindAPIService(t, inv.Stdin, "", inv.Args...)
@@ -368,8 +368,8 @@ func simulateBrowser(t *testing.T, authURLCh chan string, resource string) {
368368
err := browser.Open(authURL)
369369
require.NoError(t, err)
370370

371-
t.Logf("Waiting for browser to be at /resources")
372-
framework.BrowerEventuallyAtPath(t, browser, "/resources")
371+
t.Logf("Waiting for browser to be at /clusters/-/resources")
372+
framework.BrowerEventuallyAtPath(t, browser, "/clusters/-/resources")
373373

374374
t.Logf("Clicking %s", resource)
375375
err = browser.Click("a." + resource)

test/e2e/framework/backend.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ func StartBackendWithoutDefaultArgs(t *testing.T, clientConfig *rest.Config, arg
9696
server, err := backend.NewServer(ctx, config)
9797
require.NoError(t, err)
9898

99-
server.OptionallyStartInformers(ctx)
10099
err = server.Run(ctx)
101100
require.NoError(t, err)
102101
t.Logf("backend listening on %s", addr)

0 commit comments

Comments
 (0)