NixOS · Apr 27, 2020
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,12 +59,3 @@ jobs:
         uses: cachix/install-nix-action@v8
       - name: Coverage
         run: './ci/check-tests.sh'
-  functional:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Nix
-        uses: cachix/install-nix-action@v8
-      - name: Functional
-        run: './ci/run-functional.sh'
diff --git a/ci/run-functional.sh b/ci/run-functional.sh
diff --git a/tests/functional-1.7/__init__.py b/tests/functional-1.7/__init__.py
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
@@ -0,0 +1,14 @@
+import os
+from os import path
+import nixops.statefile
+from tests import db_file
+
+
+class DatabaseUsingTest(object):
+    _multiprocess_can_split_ = True
+
+    def setup(self):
+        self.sf = nixops.statefile.StateFile(db_file)
+
+    def teardown(self):
+        self.sf.close()
diff --git a/tests/functional/container/configuration.nix b/tests/functional/container/configuration.nix
diff --git a/tests/functional/container/default.nix b/tests/functional/container/default.nix
diff --git a/tests/functional/deployment/deployment.nix b/tests/functional/deployment/deployment.nix
diff --git a/...tional-1.7/ec2-rds-dbinstance-with-sg.nix → ...functional/ec2-rds-dbinstance-with-sg.nix b/...tional-1.7/ec2-rds-dbinstance-with-sg.nix → ...functional/ec2-rds-dbinstance-with-sg.nix
diff --git a/tests/functional-1.7/ec2-rds-dbinstance.nix → tests/functional/ec2-rds-dbinstance.nix b/tests/functional-1.7/ec2-rds-dbinstance.nix → tests/functional/ec2-rds-dbinstance.nix
diff --git a/...onal-1.7/ec2_with_nvme_device_mapping.nix → ...nctional/ec2_with_nvme_device_mapping.nix b/...onal-1.7/ec2_with_nvme_device_mapping.nix → ...nctional/ec2_with_nvme_device_mapping.nix
diff --git a/...functional-1.7/generic_deployment_test.py → tests/functional/generic_deployment_test.py b/...functional-1.7/generic_deployment_test.py → tests/functional/generic_deployment_test.py
diff --git a/tests/functional-1.7/invalid-identifier.nix → tests/functional/invalid-identifier.nix b/tests/functional-1.7/invalid-identifier.nix → tests/functional/invalid-identifier.nix
diff --git a/tests/functional/networks/trivial/network.nix b/tests/functional/networks/trivial/network.nix
diff --git a/...unctional-1.7/single_machine_ec2_base.nix → tests/functional/single_machine_ec2_base.nix b/...unctional-1.7/single_machine_ec2_base.nix → tests/functional/single_machine_ec2_base.nix
diff --git a/...onal-1.7/single_machine_ec2_base_nvme.nix → ...nctional/single_machine_ec2_base_nvme.nix b/...onal-1.7/single_machine_ec2_base_nvme.nix → ...nctional/single_machine_ec2_base_nvme.nix
diff --git a/...functional-1.7/single_machine_ec2_ebs.nix → tests/functional/single_machine_ec2_ebs.nix b/...functional-1.7/single_machine_ec2_ebs.nix → tests/functional/single_machine_ec2_ebs.nix
diff --git a/...al-1.7/single_machine_ec2_raid-0-nvme.nix → ...tional/single_machine_ec2_raid-0-nvme.nix b/...al-1.7/single_machine_ec2_raid-0-nvme.nix → ...tional/single_machine_ec2_raid-0-nvme.nix
diff --git a/...ctional-1.7/single_machine_ec2_raid-0.nix → .../functional/single_machine_ec2_raid-0.nix b/...ctional-1.7/single_machine_ec2_raid-0.nix → .../functional/single_machine_ec2_raid-0.nix
diff --git a/...-1.7/single_machine_ec2_spot_instance.nix → ...onal/single_machine_ec2_spot_instance.nix b/...-1.7/single_machine_ec2_spot_instance.nix → ...onal/single_machine_ec2_spot_instance.nix
diff --git a/...onal-1.7/single_machine_elsewhere_key.nix → ...nctional/single_machine_elsewhere_key.nix b/...onal-1.7/single_machine_elsewhere_key.nix → ...nctional/single_machine_elsewhere_key.nix
diff --git a/...unctional-1.7/single_machine_gce_base.nix → tests/functional/single_machine_gce_base.nix b/...unctional-1.7/single_machine_gce_base.nix → tests/functional/single_machine_gce_base.nix
diff --git a/...nctional-1.7/single_machine_has_hello.nix → ...s/functional/single_machine_has_hello.nix b/...nctional-1.7/single_machine_has_hello.nix → ...s/functional/single_machine_has_hello.nix
diff --git a/...onal-1.7/single_machine_libvirtd_base.nix → ...nctional/single_machine_libvirtd_base.nix b/...onal-1.7/single_machine_libvirtd_base.nix → ...nctional/single_machine_libvirtd_base.nix
diff --git a/...ional-1.7/single_machine_logical_base.nix → ...unctional/single_machine_logical_base.nix b/...ional-1.7/single_machine_logical_base.nix → ...unctional/single_machine_logical_base.nix
diff --git a/...functional-1.7/single_machine_outputs.nix → tests/functional/single_machine_outputs.nix b/...functional-1.7/single_machine_outputs.nix → tests/functional/single_machine_outputs.nix
diff --git a/...tional-1.7/single_machine_outputs_mod.nix → ...functional/single_machine_outputs_mod.nix b/...tional-1.7/single_machine_outputs_mod.nix → ...functional/single_machine_outputs_mod.nix
diff --git a/...unctional-1.7/single_machine_rollback.nix → tests/functional/single_machine_rollback.nix b/...unctional-1.7/single_machine_rollback.nix → tests/functional/single_machine_rollback.nix
diff --git a/...ctional-1.7/single_machine_secret_key.nix → .../functional/single_machine_secret_key.nix b/...ctional-1.7/single_machine_secret_key.nix → .../functional/single_machine_secret_key.nix
diff --git a/tests/functional-1.7/single_machine_test.py → tests/functional/single_machine_test.py b/tests/functional-1.7/single_machine_test.py → tests/functional/single_machine_test.py
diff --git a/tests/functional/snakeoil/id_ed25519 b/tests/functional/snakeoil/id_ed25519
diff --git a/tests/functional/snakeoil/id_ed25519.pub b/tests/functional/snakeoil/id_ed25519.pub
diff --git a/tests/functional-1.7/test_backups.py → tests/functional/test_backups.py b/tests/functional-1.7/test_backups.py → tests/functional/test_backups.py
diff --git a/tests/functional-1.7/test_cloning_clones.py → tests/functional/test_cloning_clones.py b/tests/functional-1.7/test_cloning_clones.py → tests/functional/test_cloning_clones.py
diff --git a/...s/functional-1.7/test_deleting_deletes.py → tests/functional/test_deleting_deletes.py b/...s/functional-1.7/test_deleting_deletes.py → tests/functional/test_deleting_deletes.py
diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
diff --git a/tests/functional-1.7/test_deploys_nixos.py → tests/functional/test_deploys_nixos.py b/tests/functional-1.7/test_deploys_nixos.py → tests/functional/test_deploys_nixos.py
diff --git a/...ctional-1.7/test_deploys_spot_instance.py → .../functional/test_deploys_spot_instance.py b/...ctional-1.7/test_deploys_spot_instance.py → .../functional/test_deploys_spot_instance.py
diff --git a/...functional-1.7/test_ec2_rds_dbinstance.py → tests/functional/test_ec2_rds_dbinstance.py b/...functional-1.7/test_ec2_rds_dbinstance.py → tests/functional/test_ec2_rds_dbinstance.py
diff --git a/...-1.7/test_ec2_with_nvme_device_mapping.py → ...onal/test_ec2_with_nvme_device_mapping.py b/...-1.7/test_ec2_with_nvme_device_mapping.py → ...onal/test_ec2_with_nvme_device_mapping.py
diff --git a/...functional-1.7/test_invalid_identifier.py → tests/functional/test_invalid_identifier.py b/...functional-1.7/test_invalid_identifier.py → tests/functional/test_invalid_identifier.py
diff --git a/tests/functional-1.7/test_output_creates.py → tests/functional/test_output_creates.py b/tests/functional-1.7/test_output_creates.py → tests/functional/test_output_creates.py
diff --git a/.../functional-1.7/test_query_deployments.py → tests/functional/test_query_deployments.py b/.../functional-1.7/test_query_deployments.py → tests/functional/test_query_deployments.py
diff --git a/.../functional-1.7/test_rebooting_reboots.py → tests/functional/test_rebooting_reboots.py b/.../functional-1.7/test_rebooting_reboots.py → tests/functional/test_rebooting_reboots.py
diff --git a/...functional-1.7/test_rollback_rollsback.py → tests/functional/test_rollback_rollsback.py b/...functional-1.7/test_rollback_rollsback.py → tests/functional/test_rollback_rollsback.py
diff --git a/...nctional-1.7/test_send_keys_sends_keys.py → ...s/functional/test_send_keys_sends_keys.py b/...nctional-1.7/test_send_keys_sends_keys.py → ...s/functional/test_send_keys_sends_keys.py
diff --git a/tests/functional-1.7/test_starting_starts.py → tests/functional/test_starting_starts.py b/tests/functional-1.7/test_starting_starts.py → tests/functional/test_starting_starts.py
diff --git a/tests/functional-1.7/test_stopping_stops.py → tests/functional/test_stopping_stops.py b/tests/functional-1.7/test_stopping_stops.py → tests/functional/test_stopping_stops.py
diff --git a/tests/functional-1.7/vpc.nix → tests/functional/vpc.nix b/tests/functional-1.7/vpc.nix → tests/functional/vpc.nix
diff --git a/tests/functional-1.7/vpc.py → tests/functional/vpc.py b/tests/functional-1.7/vpc.py → tests/functional/vpc.py