fixing up tests

Author: vsoch

spython/instance/cmd/iutils.py

@@ -47,7 +47,9 @@ def get(self, name, return_json=False, quiet=False):
     '''get is a list for a single instance. It is assumed to be running,
        and we need to look up the PID, etc.
     '''
-    self._check_install()
+    from spython.utils import check_install
+    check_install()
+
     cmd = self._init_command('instance.list')
     cmd.append(name)
     output = run_command(cmd, quiet=True)

spython/instance/cmd/start.py

@@ -34,8 +34,8 @@ def start(self, image=None, name=None, sudo=False, options=[]):
        singularity [...] instance.start [...] <container path> <instance name>
 
     '''        
-    from spython.utils import run_command
-    self._check_install()
+    from spython.utils import ( run_command, check_install )
+    check_install()
 
     # If no name provided, give it an excellent one!
     if name is None:

spython/instance/cmd/stop.py

@@ -33,7 +33,7 @@ def stop(self, name=None, sudo=False):
        singularity [...] instance.start [...] <container path> <instance name>
 
     '''        
-    from spython.utils import check_install, run_command
+    from spython.utils import ( check_install, run_command )
     check_install()
 
     cmd = self._init_command('instance.stop')

spython/main/__init__.py

@@ -56,12 +56,10 @@ def get_client(quiet=False, debug=False):
     # Command Groups, Images
     from spython.image.cmd import image_group        # deprecated image commands
     Client.image = image_group
-    Client.image._check_install = Client._check_install
 
     # Commands Groups, Instances
     from spython.instance.cmd import instance_group  # instance level commands
     Client.instance = instance_group
-    Client.instance._check_install = Client._check_install
     Client.instance_stopall = stopall
 
     # Initialize

spython/main/apps.py

@@ -32,7 +32,8 @@ def apps(self, image=None, full_path=False, root=''):
        image_path: full path to the image
 
     '''
-    self._check_install()
+    from spython.utils import check_install
+    check_install()
 
     # No image provided, default to use the client's loaded image
     if image is None:

spython/image/cmd/README.md spython/main/base/README.mdspython/image/cmd/README.md renamed to spython/main/base/README.md

@@ -56,7 +56,9 @@ def build(self, recipe=None,
        sudo: give sudo to the command (or not) default is True for build
     
     '''
-    self._check_install()
+    from spython.utils import check_install
+    check_install()
+
     cmd = self._init_command('build')
 
     # No image provided, default to use the client's loaded image

spython/main/build.py

@@ -48,8 +48,10 @@ def execute(self,
              directories within your container using bind mounts
 
     '''
+    from spython.utils import check_install
+    check_install()
+
     cmd = self._init_command('exec')
-    self._check_install()
 
     # If the image is given as a list, it's probably the command
     if isinstance(image, list):

spython/main/execute.py

@@ -33,7 +33,8 @@ def help(self, command=None):
         command: the command to get help for, if none, prints general help
 
     '''
-    self._check_install()
+    from spython.utils import check_install
+    check_install()
 
     cmd = ['singularity','--help']
     if command != None:

spython/main/help.py

@@ -30,7 +30,8 @@ def inspect(self,image=None, json=True, app=None):
        app: if defined, return help in context of an app
 
     '''
-    self._check_install()
+    from spython.utils import check_install
+    check_install()
 
     # No image provided, default to use the client's loaded image
     if image is None: