Merge pull request #71 from sbidoul/imp-test-cycle

Simplify dev/test cycle

Author: sbidoul

.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
+{
+	"name": "Existing Docker Compose (Extend)",
+
+	// Update the 'dockerComposeFile' list if you have more compose files or use different names.
+	// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
+	"dockerComposeFile": [
+		"../tests/docker-compose.yml",
+		"docker-compose.yml",
+	],
+
+	// The 'service' property is the name of the service for the container that VS Code should
+	// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+	"service": "test",
+
+	// The optional 'workspaceFolder' property is the path VS Code should open by default when
+	// connected. This is typically a file mount in .devcontainer/docker-compose.yml
+	"workspaceFolder": "/mnt/oca-ci",
+
+    "remoteEnv": {
+		"PATH": "/mnt/oca-ci/bin:${containerEnv:PATH}",
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line if you want start specific services in your Docker Compose config.
+	// "runServices": [],
+
+	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+	// "shutdownAction": "none",
+
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,3 @@
+services:
+  test:
+    command: [sleep, infinity]

README.md

@@ -75,3 +75,7 @@ Tune it to your liking, then run:
 
 `docker compose run --build test ./runtests.sh -v`
 
+This docker-compose mounts this project, and `runtests.sh` adds then `bin` directory to
+the `PATH` for easier dev/test iteration.
+
+There is also a devcontainer configuration.

pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+testpaths = 
+   tests
+addopts = --ignore=tests/data

tests/docker-compose.yml

@@ -1,19 +1,20 @@
 services:
   test:
-    build:
-      context: ..
-      args:
-        codename: jammy
-        python_version: "3.10"
-        odoo_version: "16.0"
+    image: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
+    # build:
+    #   context: ..
+    #   args:
+    #     codename: jammy
+    #     python_version: "3.10"
+    #     odoo_version: "16.0"
     volumes:
-      - .:/mnt/tests
-    working_dir: /mnt/tests
+      - ..:/mnt/oca-ci
+    working_dir: /mnt/oca-ci/tests
     depends_on:
       - postgres
   postgres:
     image: postgres
     environment:
       POSTGRES_USER: odoo
       POSTGRES_PASSWORD: odoo
-      POSTGRES_DB: odoo
+      POSTGRES_DB: odoo

tests/requirements.txt

@@ -0,0 +1,2 @@
+# test requirements
+pytest

tests/runtests.sh

@@ -6,8 +6,11 @@ set -e
 # which is assumed to be mounted somewhere in the docker image.
 
 here=$(dirname $0)
-testvenv=/tmp/testvenv 
 
+testvenv=/tmp/testvenv 
 /usr/bin/python3 -m venv $testvenv
-$testvenv/bin/pip install pytest
+$testvenv/bin/pip install -r $here/requirements.txt
+
+export PATH=$here/../bin:$PATH
+
 $testvenv/bin/pytest --color=yes --ignore $here/data $here "$@"