Skip to content

Commit 7afc4c4

Browse files
authored
Rename test directory (aws#21)
* Rename top-level test → tests
1 parent c1c9b29 commit 7afc4c4

30 files changed

+33
-33
lines changed

Diff for: .dockerignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
**/node_modules/
55
**/dist/
66

7-
test/integration/*
8-
!test/integration/resources/
9-
!test/integration/test-handlers/
7+
tests/integration/*
8+
!tests/integration/resources/
9+
!tests/integration/test-handlers/

Diff for: .gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
generated.docker-compose.*.yml
22

3-
test/integration/resources/init
3+
tests/integration/resources/init
44

55
node_modules/
66
*.tsbuildinfo

Diff for: Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ init:
99

1010
.PHONY: test
1111
test: check-format
12-
pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 test
12+
pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 tests
1313

1414
.PHONY: setup-codebuild-agent
1515
setup-codebuild-agent:
16-
docker build -t codebuild-agent - < test/integration/codebuild-local/Dockerfile.agent
16+
docker build -t codebuild-agent - < tests/integration/codebuild-local/Dockerfile.agent
1717

1818
.PHONY: test-smoke
1919
test-smoke: setup-codebuild-agent
20-
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 3.8
20+
CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_one.sh tests/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 3.8
2121

2222
.PHONY: test-integ
2323
test-integ: setup-codebuild-agent
24-
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild/.
24+
CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_all.sh tests/integration/codebuild/.
2525

2626
.PHONY: check-security
2727
check-security:
2828
bandit -r awslambdaric
2929

3030
.PHONY: format
3131
format:
32-
black setup.py awslambdaric/ test/
32+
black setup.py awslambdaric/ tests/
3333

3434
.PHONY: check-format
3535
check-format:
36-
black --check setup.py awslambdaric/ test/
36+
black --check setup.py awslambdaric/ tests/
3737

3838
# Command to run everytime you make changes to verify everything works
3939
.PHONY: dev

Diff for: test/__init__.py renamed to tests/__init__.py

File renamed without changes.

Diff for: test/integration/codebuild/buildspec.os.alpine.1.yml renamed to tests/integration/codebuild/buildspec.os.alpine.1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ phases:
2727
- echo "Extracting and including the Runtime Interface Emulator"
2828
- SCRATCH_DIR=".scratch"
2929
- mkdir "${SCRATCH_DIR}"
30-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
30+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3131
- >
32-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
32+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3333
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3434
- >
3535
echo "RUN apk add curl" >> \

Diff for: test/integration/codebuild/buildspec.os.alpine.2.yml renamed to tests/integration/codebuild/buildspec.os.alpine.2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ phases:
2929
- echo "Extracting and including the Runtime Interface Emulator"
3030
- SCRATCH_DIR=".scratch"
3131
- mkdir "${SCRATCH_DIR}"
32-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
32+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3333
- >
34-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
34+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3535
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3636
- >
3737
echo "RUN apk add curl" >> \

Diff for: test/integration/codebuild/buildspec.os.alpine.3.yml renamed to tests/integration/codebuild/buildspec.os.alpine.3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ phases:
2929
- echo "Extracting and including the Runtime Interface Emulator"
3030
- SCRATCH_DIR=".scratch"
3131
- mkdir "${SCRATCH_DIR}"
32-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
32+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3333
- >
34-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
34+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3535
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3636
- >
3737
echo "RUN apk add curl" >> \

Diff for: test/integration/codebuild/buildspec.os.amazonlinux.yml renamed to tests/integration/codebuild/buildspec.os.amazonlinux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ phases:
3030
- echo "Extracting and including the Runtime Interface Emulator"
3131
- SCRATCH_DIR=".scratch"
3232
- mkdir "${SCRATCH_DIR}"
33-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
33+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3434
- >
35-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
35+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3636
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3737
- >
3838
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/codebuild/buildspec.os.centos.1.yml renamed to tests/integration/codebuild/buildspec.os.centos.1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ phases:
2929
- echo "Extracting and including the Runtime Interface Emulator"
3030
- SCRATCH_DIR=".scratch"
3131
- mkdir "${SCRATCH_DIR}"
32-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
32+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3333
- >
34-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
34+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3535
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3636
- >
3737
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/codebuild/buildspec.os.centos.2.yml renamed to tests/integration/codebuild/buildspec.os.centos.2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ phases:
2929
- echo "Extracting and including the Runtime Interface Emulator"
3030
- SCRATCH_DIR=".scratch"
3131
- mkdir "${SCRATCH_DIR}"
32-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
32+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3333
- >
34-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
34+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3535
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3636
- >
3737
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/codebuild/buildspec.os.debian.yml renamed to tests/integration/codebuild/buildspec.os.debian.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ phases:
2929
- echo "Extracting and including the Runtime Interface Emulator"
3030
- SCRATCH_DIR=".scratch"
3131
- mkdir "${SCRATCH_DIR}"
32-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
32+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3333
- >
34-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
34+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3535
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3636
- >
3737
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/codebuild/buildspec.os.ubuntu.1.yml renamed to tests/integration/codebuild/buildspec.os.ubuntu.1.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ phases:
2828
- echo "Extracting and including the Runtime Interface Emulator"
2929
- SCRATCH_DIR=".scratch"
3030
- mkdir "${SCRATCH_DIR}"
31-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
31+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3232
- >
33-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
33+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3434
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3535
- >
3636
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/codebuild/buildspec.os.ubuntu.2.yml renamed to tests/integration/codebuild/buildspec.os.ubuntu.2.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ phases:
2727
- echo "Extracting and including the Runtime Interface Emulator"
2828
- SCRATCH_DIR=".scratch"
2929
- mkdir "${SCRATCH_DIR}"
30-
- tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
30+
- tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
3131
- >
32-
cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
32+
cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
3333
"${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
3434
- >
3535
echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

Diff for: test/integration/docker/Dockerfile.echo.alpine renamed to tests/integration/docker/Dockerfile.echo.alpine

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG FUNCTION_DIR="/home/app/"
3838
# Create function directory
3939
RUN mkdir -p ${FUNCTION_DIR}
4040
# Copy function code
41-
COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
41+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
4242
# Copy Runtime Interface Client .tgz
4343
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
4444

Diff for: test/integration/docker/Dockerfile.echo.amazonlinux renamed to tests/integration/docker/Dockerfile.echo.amazonlinux

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ARG FUNCTION_DIR="/home/app/"
8686
# Create function directory
8787
RUN mkdir -p ${FUNCTION_DIR}
8888
# Copy function code
89-
COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
89+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
9090
# Copy Runtime Interface Client .tgz
9191
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
9292

Diff for: test/integration/docker/Dockerfile.echo.centos renamed to tests/integration/docker/Dockerfile.echo.centos

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ARG FUNCTION_DIR="/home/app/"
8686
# Create function directory
8787
RUN mkdir -p ${FUNCTION_DIR}
8888
# Copy function code
89-
COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
89+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
9090
# Copy Runtime Interface Client .tgz
9191
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
9292

Diff for: test/integration/docker/Dockerfile.echo.debian renamed to tests/integration/docker/Dockerfile.echo.debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ARG FUNCTION_DIR="/home/app/"
2727
# Create function directory
2828
RUN mkdir -p ${FUNCTION_DIR}
2929
# Copy function code
30-
COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
30+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
3131
# Copy Runtime Interface Client .tgz
3232
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
3333

Diff for: test/integration/docker/Dockerfile.echo.ubuntu renamed to tests/integration/docker/Dockerfile.echo.ubuntu

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ARG FUNCTION_DIR="/home/app/"
5555
# Create function directory
5656
RUN mkdir -p ${FUNCTION_DIR}
5757
# Copy function code
58-
COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
58+
COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
5959
# Copy Runtime Interface Client .tgz
6060
RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
6161

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: test/test_main.py renamed to tests/test_main.py

File renamed without changes.

0 commit comments

Comments
 (0)