Cleanup and fomatting fixes

Signed-off-by: Alvin Baptiste <[email protected]>

salvo/salvo.py

@@ -14,7 +14,7 @@
 
 site.addsitedir("src")
 
-from lib.message_helper import load_control_doc
+from lib.job_control_loader import load_control_doc
 from lib.run_benchmark import Benchmark
 
 LOGFORMAT = "%(asctime)s: %(process)d [ %(levelname)-5s] [%(module)-5s] %(message)s"

salvo/src/lib/docker_image.py

@@ -8,7 +8,7 @@
 
 # Ref: https://docker-py.readthedocs.io/en/stable/index.html
 import docker
-from  lib.docker_volume import DockerVolume
+from lib.docker_volume import DockerVolume
 
 from google.protobuf.json_format import (Error, MessageToJson)
 

salvo/src/lib/test_docker_image.py

@@ -17,7 +17,7 @@ def test_pull_image():
   """Test retrieving an image"""
 
   if not os.path.exists("/var/run/docker.sock"):
-      pytest.skip("Skipping docker test since no socket is available")
+    pytest.skip("Skipping docker test since no socket is available")
 
   docker_image = DockerImage()
   container = docker_image.pull_image("oschaaf/benchmark-dev:latest")
@@ -28,7 +28,7 @@ def test_run_image():
   """Test executing a command in an image"""
 
   if not os.path.exists("/var/run/docker.sock"):
-      pytest.skip("Skipping docker test since no socket is available")
+    pytest.skip("Skipping docker test since no socket is available")
 
   env = ['key1=val1', 'key2=val2']
   cmd = ['uname', '-r']
@@ -48,7 +48,7 @@ def test_list_images():
   """Test listing available images"""
 
   if not os.path.exists("/var/run/docker.sock"):
-      pytest.skip("Skipping docker test since no socket is available")
+    pytest.skip("Skipping docker test since no socket is available")
 
   docker_image = DockerImage()
   images = docker_image.list_images()