updating tests, instance was running out of room

Author: vsoch

singularity/cli.py

@@ -44,6 +44,7 @@
 import tempfile
 import shutil
 import json
+import sys
 import os
 import re
 
@@ -259,20 +260,22 @@ def inspect(self,image_path,json=True,labels=True,
         return output
 
 
-    def pull(self,image_path,pull_folder=None,name_by=None,image_name=None):
+    def pull(self,image_path,pull_folder=None,
+                             name_by_hash=False,
+                             name_by_commit=False,
+                             image_name=None):
         '''pull will pull a singularity hub image
         :param image_path: full path to image
         :param name_by: can be one of commit or hash, default is by image name
         ''' 
         if image_name is not None:
-            name_by = None
-        if name_by is not None:
-            name_by = name_by.lower()
+            name_by_hash=False
+            name_by_commit=False
 
         if pull_folder is not None:
             os.environ['SINGULARITY_PULLFOLDER'] = pull_folder
 
-        if not image_path.startswith('shub://') or not image_path.startswith('docker://'):
+        if not image_path.startswith('shub://') and not image_path.startswith('docker://'):
             bot.logger.error("pull is only valid for docker and shub, %s is invalid.",image_name)
             sys.exit(1)           
 
@@ -282,20 +285,22 @@ def pull(self,image_path,pull_folder=None,name_by=None,image_name=None):
             cmd = ['singularity','pull']
 
         if image_path.startswith('shub://'):
-            if name_by in ['commit','hash']:
-                bot.logger.debug("user specified naming pulled image by %s",name_by)
-                name_by = "--%s " %name_by
-                cmd.append(name_by)
-            elif image_name is not None:
-                name_by = "--name %s" %(image_name)
-
+            if image_name is not None:
+                bot.logger.debug("user specified naming pulled image %s",image_name)
+                cmd = cmd +["--name",image_name]
+            elif name_by_commit is True:
+                bot.logger.debug("user specified naming by commit.")
+                cmd.append("--commit")
+            elif name_by_hash is True:
+                bot.logger.debug("user specified naming by hash.")
+                cmd.append("--hash")
+ 
         elif image_path.startswith('docker://'):
             if image_name is not None:
                 bot.logger.debug("user specified name of image as %s",image_name)
-                name_by = "--name %s" %(image_name)
+                cmd = cmd + ["--name",image_name]
 
         cmd.append(image_path)
-
         output = self.run_command(cmd)
         output = self.println(output,quiet=True)        
         return output.split("Container is at:")[-1].strip('\n').strip()

singularity/tests/test_client.py

@@ -73,18 +73,22 @@ def test_import(self):
         self.cli.importcmd(container,'docker://ubuntu')
         result = test_container(container)
         self.assertEqual(result['return_code'],0)
+        os.remove(container)
 
     def test_run(self):
         print("Testing client.run command")
         container = create_container(do_import=True)
         result = self.cli.run(container)
         self.assertEqual(result,'')
+        os.remove(container)
+
 
     def test_exec(self):
         print('Testing client.execute command')
         container = create_container(do_import=True) 
         result = self.cli.execute(container,'ls /')
         print(result)
+        os.remove(container)
         #if isinstance(result,bytes):
         #    result = result.decode('utf-8')
         #self.assertTrue(len(result)>0)
@@ -96,20 +100,24 @@ def test_inspect(self):
         result = self.cli.inspect(container,quiet=True)
         labels = json.loads(result)
         self.assertTrue('data' in labels)     
+        os.remove(container)
 
 
     def test_run(self):
         print("Testing client.run command")
         container = create_container(do_import=True)
         result = self.cli.run(container)
         self.assertEqual(result,'')
+        os.remove(container)
 
 
     def test_exec(self):
         print('Testing client.execute command')
         container = create_container(do_import=True) 
         result = self.cli.execute(container,'ls /')
         print(result)
+        os.remove(container)
+
         #if isinstance(result,bytes):
         #    result = result.decode('utf-8')
         #self.assertTrue(len(result)>0)
@@ -121,15 +129,27 @@ def test_pull(self):
 
         print("Case 1: Testing naming pull by image name")
         image = self.cli.pull("shub://vsoch/singularity-images")
+        self.assertTrue(os.path.exists(image))
         print(image)
+        os.remove(image)
 
         print("Case 2: Testing naming pull by image commit")
-        image = self.cli.pull("shub://vsoch/singularity-images",name_by="commit")
+        image = self.cli.pull("shub://vsoch/singularity-images",name_by_commit=True)
+        self.assertTrue(os.path.exists(image))
         print(image)
+        os.remove(image)
 
         print("Case 3: Testing naming pull by image hash")
-        image = self.cli.pull("shub://vsoch/singularity-images",name_by="hash")
+        image = self.cli.pull("shub://vsoch/singularity-images",name_by_hash=True)
+        self.assertTrue(os.path.exists(image))
+        print(image)
+        os.remove(image)
+
+        print("Case 3: Testing docker pull")
+        image = self.cli.pull("docker://ubuntu:14.04")
         print(image)
+        self.assertTrue(os.path.exists(image))
+        os.remove(image)
 
 
     def test_get_image(self):