From 7bf834f3407fd4f99f9970cc2273e84a631c27f5 Mon Sep 17 00:00:00 2001 From: Caleb Gilmour Date: Tue, 16 Jun 2020 21:26:17 +0000 Subject: [PATCH] Update integration tests to match URL obfuscation change --- test/integration/nginx/Dockerfile | 5 +++-- test/integration/nginx/expected_tc6.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/integration/nginx/Dockerfile b/test/integration/nginx/Dockerfile index 0301c0dd..bfaa11ff 100644 --- a/test/integration/nginx/Dockerfile +++ b/test/integration/nginx/Dockerfile @@ -73,9 +73,10 @@ COPY ./test/integration/nginx/dd-config.json /etc/dd-config.json RUN mkdir -p /var/www/ COPY ./test/integration/nginx/index.html /var/www/index.html -COPY ./test/integration/nginx/nginx_integration_test.sh ./ -COPY ./test/integration/nginx/expected_*.json ./ # TODO(cgilmour): Hack to pin a dep of msgpack-cli RUN git clone -b v1.1.2 https://github.com/ugorji/go /root/go/src/github.com/ugorji/go RUN go get github.com/jakm/msgpack-cli +# Copy these last so that edits don't need as many image rebuild steps +COPY ./test/integration/nginx/nginx_integration_test.sh ./ +COPY ./test/integration/nginx/expected_*.json ./ CMD [ "bash", "-x", "./nginx_integration_test.sh"] diff --git a/test/integration/nginx/expected_tc6.json b/test/integration/nginx/expected_tc6.json index fd7af267..3ccc8059 100644 --- a/test/integration/nginx/expected_tc6.json +++ b/test/integration/nginx/expected_tc6.json @@ -8,7 +8,7 @@ "http.method": "GET", "http.status_code": "200", "http.status_line": "200 OK", - "http.url": "http://localhost/proxy/?", + "http.url": "http://localhost/proxy/", "operation": "GET /proxy/" }, "metrics": {