XP-261 move tests to own dir (#197)

* XP-261 move tests to tests dir * XP-261 add todo's to pytest.ini * XP-261 fix pytest.ini after rebase
xaynetwork · Dec 20, 2019 · b476f6a · b476f6a
1 parent c1f319f
commit b476f6a
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 1 deletion.
diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,7 @@
+# remove xain_fl testpath below once benchmarks and datasets are removed
+# TODO: separate unit and integration tests: https://xainag.atlassian.net/browse/XP-352
 [pytest]
-testpaths = xain_fl
+testpaths = xain_fl tests
 markers =
     unmarked: every test without a marker will automatically have this marker assigned. You could senselessly add it manually
     integration: mark a integration test

diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/xain_fl/fl/coordinator/aggregate_test.py → tests/aggregate_test.py b/xain_fl/fl/coordinator/aggregate_test.py → tests/aggregate_test.py
diff --git a/xain_fl/cproto/conftest.py → tests/conftest.py b/xain_fl/cproto/conftest.py → tests/conftest.py
diff --git a/xain_fl/fl/coordinator/controller_test.py → tests/controller_test.py b/xain_fl/fl/coordinator/controller_test.py → tests/controller_test.py
diff --git a/xain_fl/cproto/test_coordinator.py → tests/test_coordinator.py b/xain_fl/cproto/test_coordinator.py → tests/test_coordinator.py
diff --git a/xain_fl/cproto/test_grpc.py → tests/test_grpc.py b/xain_fl/cproto/test_grpc.py → tests/test_grpc.py
diff --git a/xain_fl/cproto/test_participant.py → tests/test_participant.py b/xain_fl/cproto/test_participant.py → tests/test_participant.py