Skip to content

Commit

Permalink
e2e: query: Fix e2e externalPrefix tests
Browse files Browse the repository at this point in the history
Signed-off-by: Prem Kumar <prmsrswt@gmail.com>
  • Loading branch information
onprem committed Jun 27, 2020
1 parent 3559fcb commit fe380e1
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions test/e2e/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,25 +167,27 @@ func TestQuery(t *testing.T) {
})
}

func TestQueryRoutePrefix(t *testing.T) {
func TestQueryExternalPrefixWithoutReverseProxy(t *testing.T) {
t.Parallel()

s, err := e2e.NewScenario("e2e_test_query_route_prefix")
testutil.Ok(t, err)
t.Cleanup(e2ethanos.CleanScenario(t, s))

externalPrefix := "test"

q, err := e2ethanos.NewQuerier(
s.SharedDir(), "1",
nil,
nil,
nil,
"test",
"",
externalPrefix,
)
testutil.Ok(t, err)
testutil.Ok(t, s.StartAndWaitReady(q))

checkNetworkRequests(t, "http://"+q.HTTPEndpoint()+"/test/graph")
checkNetworkRequests(t, "http://"+q.HTTPEndpoint()+"/"+externalPrefix+"/graph")
}

func TestQueryExternalPrefix(t *testing.T) {
Expand All @@ -208,7 +210,7 @@ func TestQueryExternalPrefix(t *testing.T) {
testutil.Ok(t, err)
testutil.Ok(t, s.StartAndWaitReady(q))

querierURL := urlParse(t, "http://"+q.HTTPEndpoint())
querierURL := urlParse(t, "http://"+q.HTTPEndpoint()+"/"+externalPrefix)

querierProxy := httptest.NewServer(e2ethanos.NewSingleHostReverseProxy(querierURL, externalPrefix))

Expand Down

0 comments on commit fe380e1

Please sign in to comment.