Merge branch 'main' into clickup-integrations

.github/PULL_REQUEST_TEMPLATE.md

@@ -29,6 +29,7 @@ Please leave one option from the following and delete the rest:
 - [ ] Scheduled resync able to abort existing resync and start a new one
 - [ ] Tested with at least 2 integrations from scratch
 - [ ] Tested with Kafka and Polling event listeners
+- [ ] Tested deletion of entities that don't pass the selector
 
 
 ### Integration testing checklist
@@ -38,7 +39,7 @@ Please leave one option from the following and delete the rest:
 - [ ] Resync able to update entities
 - [ ] Resync able to detect and delete entities
 - [ ] Resync finishes successfully
-- [ ] If new resource kind is added or updated in the integration, add example raw data, mapping and expected result to the `examples` folder in the integration directory. 
+- [ ] If new resource kind is added or updated in the integration, add example raw data, mapping and expected result to the `examples` folder in the integration directory.
 - [ ] If resource kind is updated, run the integration with the example data and check if the expected result is achieved
 - [ ] If new resource kind is added or updated, validate that live-events for that resource are working as expected
 - [ ] Docs PR link [here](#)

.github/workflows/test.yml

@@ -57,11 +57,13 @@ jobs:
       - name: Test
         working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
         env:
-          PYTEST_ADDOPTS: --junitxml=junit/test-results-${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}.xml
+          PYTEST_ADDOPTS: --junitxml=junit/test-results-${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || 'ocean/core' }}.xml
         run: |
           make test
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
         if: ${{ always() }}
         with:
           report_paths: '**/junit/test-results-**/*.xml'
+          include_passed: true
+          require_tests: true

Makefile

@@ -43,7 +43,7 @@ define deactivate_virtualenv
     fi
 endef
 
-.SILENT: install install/all test/all lint build run new test clean bump/integrations bump/single-integration
+.SILENT: install install/all test/all lint build run new test test/watch clean bump/integrations bump/single-integration
 
 
 # Install dependencies
@@ -56,7 +56,15 @@ install:
 
 test/all: test
 	$(ACTIVATE) && \
-	pytest --import-mode=importlib -n auto ./port_ocean/tests ./integrations/*/tests
+	for dir in $(wildcard $(CURDIR)/integrations/*); do \
+		count=$$(find $$dir -type f -name '*.py' -not -path "*/venv/*" | wc -l); \
+		if [ $$count -ne 0 ]; then \
+			echo "Testing $$dir"; \
+		  	cd $$dir; \
+			$(MAKE) test || exit_code=$$?; \
+			cd ../..; \
+		fi; \
+	done;
 
 install/all: install
 	exit_code=0; \
@@ -89,7 +97,13 @@ new:
 	$(ACTIVATE) && poetry run ocean new ./integrations --public
 
 test:
-	$(ACTIVATE) && pytest -vv -n auto --ignore-glob=./integrations/* ./port_ocean/tests
+	$(ACTIVATE) && pytest
+
+test/watch:
+	$(ACTIVATE) && \
+		pytest \
+			--color=yes \
+			-f
 
 clean:
 	@find . -name '.venv' -type d -exec rm -rf {} \;