Rename test directory (#21)

* Rename top-level test → tests
aws · Mar 10, 2021 · 7afc4c4 · 7afc4c4
1 parent c1c9b29
commit 7afc4c4
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 33 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,6 +4,6 @@
 **/node_modules/
 **/dist/
 
-test/integration/*
-!test/integration/resources/
-!test/integration/test-handlers/
+tests/integration/*
+!tests/integration/resources/
+!tests/integration/test-handlers/
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 generated.docker-compose.*.yml
 
-test/integration/resources/init
+tests/integration/resources/init
 
 node_modules/
 *.tsbuildinfo

diff --git a/Makefile b/Makefile
@@ -9,31 +9,31 @@ init:
 
 .PHONY: test
 test: check-format
-	pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 test
+	pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 tests
 
 .PHONY: setup-codebuild-agent
 setup-codebuild-agent:
-	docker build -t codebuild-agent - < test/integration/codebuild-local/Dockerfile.agent
+	docker build -t codebuild-agent - < tests/integration/codebuild-local/Dockerfile.agent
 
 .PHONY: test-smoke
 test-smoke: setup-codebuild-agent
-	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
+	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
 
 .PHONY: test-integ
 test-integ: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild/.
+	CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_all.sh tests/integration/codebuild/.
 
 .PHONY: check-security
 check-security:
 	bandit -r awslambdaric
 
 .PHONY: format
 format:
-	black setup.py awslambdaric/ test/
+	black setup.py awslambdaric/ tests/
 
 .PHONY: check-format
 check-format:
-	black --check setup.py awslambdaric/ test/
+	black --check setup.py awslambdaric/ tests/
 
 # Command to run everytime you make changes to verify everything works
 .PHONY: dev

diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/...egration/codebuild-local/Dockerfile.agent → ...egration/codebuild-local/Dockerfile.agent b/...egration/codebuild-local/Dockerfile.agent → ...egration/codebuild-local/Dockerfile.agent
diff --git a/...ration/codebuild-local/codebuild_build.sh → ...ration/codebuild-local/codebuild_build.sh b/...ration/codebuild-local/codebuild_build.sh → ...ration/codebuild-local/codebuild_build.sh
diff --git a/test/integration/codebuild-local/test_all.sh → ...s/integration/codebuild-local/test_all.sh b/test/integration/codebuild-local/test_all.sh → ...s/integration/codebuild-local/test_all.sh
diff --git a/test/integration/codebuild-local/test_one.sh → ...s/integration/codebuild-local/test_one.sh b/test/integration/codebuild-local/test_one.sh → ...s/integration/codebuild-local/test_one.sh
diff --git a/...ation/codebuild/buildspec.os.alpine.1.yml → ...ation/codebuild/buildspec.os.alpine.1.yml b/...ation/codebuild/buildspec.os.alpine.1.yml → ...ation/codebuild/buildspec.os.alpine.1.yml
@@ -27,9 +27,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "RUN apk add curl" >> \

diff --git a/...ation/codebuild/buildspec.os.alpine.2.yml → ...ation/codebuild/buildspec.os.alpine.2.yml b/...ation/codebuild/buildspec.os.alpine.2.yml → ...ation/codebuild/buildspec.os.alpine.2.yml
@@ -29,9 +29,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "RUN apk add curl" >> \

diff --git a/...ation/codebuild/buildspec.os.alpine.3.yml → ...ation/codebuild/buildspec.os.alpine.3.yml b/...ation/codebuild/buildspec.os.alpine.3.yml → ...ation/codebuild/buildspec.os.alpine.3.yml
@@ -29,9 +29,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "RUN apk add curl" >> \

diff --git a/...on/codebuild/buildspec.os.amazonlinux.yml → ...on/codebuild/buildspec.os.amazonlinux.yml b/...on/codebuild/buildspec.os.amazonlinux.yml → ...on/codebuild/buildspec.os.amazonlinux.yml
@@ -30,9 +30,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/...ation/codebuild/buildspec.os.centos.1.yml → ...ation/codebuild/buildspec.os.centos.1.yml b/...ation/codebuild/buildspec.os.centos.1.yml → ...ation/codebuild/buildspec.os.centos.1.yml
@@ -29,9 +29,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/...ation/codebuild/buildspec.os.centos.2.yml → ...ation/codebuild/buildspec.os.centos.2.yml b/...ation/codebuild/buildspec.os.centos.2.yml → ...ation/codebuild/buildspec.os.centos.2.yml
@@ -29,9 +29,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/...gration/codebuild/buildspec.os.debian.yml → ...gration/codebuild/buildspec.os.debian.yml b/...gration/codebuild/buildspec.os.debian.yml → ...gration/codebuild/buildspec.os.debian.yml
@@ -29,9 +29,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/...ation/codebuild/buildspec.os.ubuntu.1.yml → ...ation/codebuild/buildspec.os.ubuntu.1.yml b/...ation/codebuild/buildspec.os.ubuntu.1.yml → ...ation/codebuild/buildspec.os.ubuntu.1.yml
@@ -28,9 +28,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/...ation/codebuild/buildspec.os.ubuntu.2.yml → ...ation/codebuild/buildspec.os.ubuntu.2.yml b/...ation/codebuild/buildspec.os.ubuntu.2.yml → ...ation/codebuild/buildspec.os.ubuntu.2.yml
@@ -27,9 +27,9 @@ phases:
       - echo "Extracting and including the Runtime Interface Emulator"
       - SCRATCH_DIR=".scratch"
       - mkdir "${SCRATCH_DIR}"
-      - tar -xvf test/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
+      - tar -xvf tests/integration/resources/aws-lambda-rie.tar.gz --directory "${SCRATCH_DIR}"
       - >
-        cp "test/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
+        cp "tests/integration/docker/Dockerfile.echo.${OS_DISTRIBUTION}" \
           "${SCRATCH_DIR}/Dockerfile.echo.${OS_DISTRIBUTION}.tmp"
       - >
         echo "COPY ${SCRATCH_DIR}/aws-lambda-rie /usr/bin/aws-lambda-rie" >> \

diff --git a/test/integration/docker-compose.template.yml → ...s/integration/docker-compose.template.yml b/test/integration/docker-compose.template.yml → ...s/integration/docker-compose.template.yml
diff --git a/...integration/docker/Dockerfile.echo.alpine → ...integration/docker/Dockerfile.echo.alpine b/...integration/docker/Dockerfile.echo.alpine → ...integration/docker/Dockerfile.echo.alpine
@@ -38,7 +38,7 @@ ARG FUNCTION_DIR="/home/app/"
 # Create function directory
 RUN mkdir -p ${FUNCTION_DIR}
 # Copy function code
-COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
+COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
 # Copy Runtime Interface Client .tgz
 RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
 

diff --git a/...ration/docker/Dockerfile.echo.amazonlinux → ...ration/docker/Dockerfile.echo.amazonlinux b/...ration/docker/Dockerfile.echo.amazonlinux → ...ration/docker/Dockerfile.echo.amazonlinux
@@ -86,7 +86,7 @@ ARG FUNCTION_DIR="/home/app/"
 # Create function directory
 RUN mkdir -p ${FUNCTION_DIR}
 # Copy function code
-COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
+COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
 # Copy Runtime Interface Client .tgz
 RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
 

diff --git a/...integration/docker/Dockerfile.echo.centos → ...integration/docker/Dockerfile.echo.centos b/...integration/docker/Dockerfile.echo.centos → ...integration/docker/Dockerfile.echo.centos
@@ -86,7 +86,7 @@ ARG FUNCTION_DIR="/home/app/"
 # Create function directory
 RUN mkdir -p ${FUNCTION_DIR}
 # Copy function code
-COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
+COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
 # Copy Runtime Interface Client .tgz
 RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
 

diff --git a/...integration/docker/Dockerfile.echo.debian → ...integration/docker/Dockerfile.echo.debian b/...integration/docker/Dockerfile.echo.debian → ...integration/docker/Dockerfile.echo.debian
@@ -27,7 +27,7 @@ ARG FUNCTION_DIR="/home/app/"
 # Create function directory
 RUN mkdir -p ${FUNCTION_DIR}
 # Copy function code
-COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
+COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
 # Copy Runtime Interface Client .tgz
 RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
 

diff --git a/...integration/docker/Dockerfile.echo.ubuntu → ...integration/docker/Dockerfile.echo.ubuntu b/...integration/docker/Dockerfile.echo.ubuntu → ...integration/docker/Dockerfile.echo.ubuntu
@@ -55,7 +55,7 @@ ARG FUNCTION_DIR="/home/app/"
 # Create function directory
 RUN mkdir -p ${FUNCTION_DIR}
 # Copy function code
-COPY test/integration/test-handlers/echo/* ${FUNCTION_DIR}
+COPY tests/integration/test-handlers/echo/* ${FUNCTION_DIR}
 # Copy Runtime Interface Client .tgz
 RUN cp ./dist/awslambdaric-test.tar.gz ${FUNCTION_DIR}/awslambdaric-test.tar.gz
 

diff --git a/...tegration/resources/aws-lambda-rie.tar.gz → ...tegration/resources/aws-lambda-rie.tar.gz b/...tegration/resources/aws-lambda-rie.tar.gz → ...tegration/resources/aws-lambda-rie.tar.gz
diff --git a/test/integration/test-handlers/echo/app.py → tests/integration/test-handlers/echo/app.py b/test/integration/test-handlers/echo/app.py → tests/integration/test-handlers/echo/app.py
diff --git a/test/test_bootstrap.py → tests/test_bootstrap.py b/test/test_bootstrap.py → tests/test_bootstrap.py
diff --git a/test/test_lambda_context.py → tests/test_lambda_context.py b/test/test_lambda_context.py → tests/test_lambda_context.py
diff --git a/test/test_lambda_runtime_client.py → tests/test_lambda_runtime_client.py b/test/test_lambda_runtime_client.py → tests/test_lambda_runtime_client.py
diff --git a/test/test_lambda_runtime_marshaller.py → tests/test_lambda_runtime_marshaller.py b/test/test_lambda_runtime_marshaller.py → tests/test_lambda_runtime_marshaller.py
diff --git a/test/test_main.py → tests/test_main.py b/test/test_main.py → tests/test_main.py