Minor changes and tests

Author: mikicz

arca/backend/docker.py

@@ -182,7 +182,7 @@ def get_image_tag(self, requirements_file: Optional[Path], dependencies: Optiona
 
         * Image type:
 
-          * i – Inherit image
+          * i – Inherited image
           * a – Arca base image
 
         * Requirements:
@@ -200,14 +200,14 @@ def get_image_tag(self, requirements_file: Optional[Path], dependencies: Optiona
         * Inherited images:
 
           * `ise` – no requirements
-          * `ide_<requirements_hash>` – with requirements
+          * `ide_<hash(requirements)>` – with requirements
 
         * From Arca base image:
 
           * `ase` – no requirements and no dependencies
-          * `asd_<dependencies_hash>` – only dependencies
-          * `are_<requirements_hash>` – only requirements
-          * `ard_<hash(dependencies_hash + requirements_hash)>` – both requirements and dependencies
+          * `asd_<hash(dependencies)>` – only dependencies
+          * `are_<hash(requirements)>` – only requirements
+          * `ard_<hash(hash(dependencies) + hash(requirements))>` – both requirements and dependencies
         """
 
         prefix = "i" if self.inherit_image is not None else "a"

arca/backend/vagrant.py

@@ -296,9 +296,10 @@ def stop_containers(self):
     def stop_vm(self):
         """ Stops or destroys the VM used to launch tasks.
         """
-        if self.destroy:
-            self.vagrant.destroy()
-            shutil.rmtree(self.vagrant.root, ignore_errors=True)
-            self.vagrant = None
-        else:
-            self.vagrant.halt()
+        if self.vagrant is not None:
+            if self.destroy:
+                self.vagrant.destroy()
+                shutil.rmtree(self.vagrant.root, ignore_errors=True)
+                self.vagrant = None
+            else:
+                self.vagrant.halt()

tests/test_result.py

@@ -16,3 +16,11 @@ def test_success():
 def test_error():
     with pytest.raises(BuildError):
         Result({"success": False, "error": "Error"})
+
+
+def test_json():
+    res = Result("""{"success": true, "result": "Message"}""")
+    assert res.output == "Message"
+
+    with pytest.raises(BuildError):
+        Result("""{"success": false, "error": "Error" """)

tests/test_task.py

@@ -27,6 +27,7 @@ def test_task_json(args, kwargs):
     task = Task("library.mod:func", args=args, kwargs=kwargs)
 
     assert isinstance(json.loads(task.json), dict)
+    assert task.hash
 
 
 @pytest.mark.parametrize("args", "kwargs", [