another round of changes for testing

Author: vsoch

singularity/tests/test_analysis_classify.py

@@ -64,7 +64,7 @@ def test_estimate_os(self):
         print("Testing singularity.analysis.classify.estimate_os")
         from singularity.analysis.classify import estimate_os
         estimated_os = estimate_os(self.container)
-        self.assertTrue(estimated_os.startswith('ubuntu')
+        self.assertTrue(estimated_os.startswith('ubuntu'))
 
 
     def test_get_tags(self):

singularity/tests/test_analysis_compare.py

@@ -34,6 +34,7 @@
     assert_equal
 )
 
+from singularity.utils import get_installdir
 from singularity.cli import get_image
 import unittest
 import tempfile
@@ -56,7 +57,7 @@ def test_container_similarity_vector(self):
         print("Testing singularity.analysis.compare.container_similarity_vector")
         import pandas
         from singularity.analysis.compare import container_similarity_vector
-        from.singularity.analysis.utils import get_packages
+        from singularity.analysis.utils import get_packages
         packages_set = get_packages('docker-os')[0:2]
         vector = container_similarity_vector(container1=self.container,
                                              custom_set=packages_set)
@@ -70,7 +71,7 @@ def test_compare_singularity_images(self):
         from singularity.analysis.compare import compare_singularity_images
         sim = compare_singularity_images(self.container,self.comparator)
         self.assertTrue(isinstance(sim,pandas.DataFrame))
-        self.assertTrue(sim.loc[container,comparator] - 0.4803262269280298 < 0.01)
+        self.assertTrue(sim.loc[self.container,self.comparator] - 0.4803262269280298 < 0.01)
 
 
     def test_compare_containers(self):
@@ -80,7 +81,7 @@ def test_compare_containers(self):
         self.assertTrue('files.txt' in comparison)
         for key in ['total1', 'total2', 'intersect', 'unique2', 'unique1']:
             self.assertTrue(key in comparison['files.txt'])
-        self.assertEqual(len(comparison['files.txt']['intersect']),2567)
+        self.assertEqual(len(comparison['files.txt']['intersect']),2565)
 
 
     def test_calculate_similarity(self):

singularity/tests/test_client.py

@@ -96,16 +96,19 @@ def test_pull(self):
 
         print("Case 1: Testing naming pull by image name")
         image = self.cli.pull("shub://vsoch/singularity-images")
+        print(image)
         self.assertTrue(os.path.exists(image))
         self.assertTrue("vsoch-singularity-images" in image)
 
         print("Case 2: Testing naming pull by image commit")
         image = self.cli.pull("shub://vsoch/singularity-images",name_by="commit")
+        print(image)
         self.assertTrue(os.path.exists(image))
         self.assertTrue("7a75cd7a32192e5d50f267982e0c30aff794076b" in image)
 
         print("Case 3: Testing naming pull by image hash")
         image = self.cli.pull("shub://vsoch/singularity-images",name_by="hash")
+        print(image)
         self.assertTrue(os.path.exists(image))
         self.assertTrue("a989bc72cb154d007aa47a5034978328" in image)
 
@@ -123,11 +126,12 @@ def test_get_image(self):
 def create_container(container=None,do_import=False):
     '''supporting function to create empty container
     '''
+    cli = Singularity()
     if container is None:
         container = "%s/container.img" %(self.tmpdir)
     if do_import is True:
-        self.cli.importcmd(container,'docker://ubuntu')
-    return self.cli.create(container)
+        cli.importcmd(container,'docker://ubuntu')
+    return cli.create(container)
 
 
 if __name__ == '__main__':

singularity/tests/test_reproduce.py

@@ -71,7 +71,7 @@ def test_get_memory_tar(self):
         file_obj.close()                
 
     def test_get_image_hashes(self):
-        from singularity.reproduce import get_image_hashes
+        from singularity.reproduce import get_image_hashes, get_image_hash
 
         print("Case 1: No specification of version returns latest")
         hashes = get_image_hashes(self.image1)
@@ -116,7 +116,7 @@ def test_get_level(self):
         for key in ['assess_content','skip_files','regexp','description']:
             self.assertTrue(key in level)
 
-    def test_get_levels(version=None):
+    def test_get_levels(self):
         from singularity.reproduce import get_levels
         print("Testing singularity.reproduce.get_levels")
 
@@ -138,7 +138,7 @@ def test_get_content_hashes(self):
         hashes = get_content_hashes(self.image1)
         for key in ['hashes','sizes','root_owned']:
             self.assertTrue(key in hashes)
-        self.assertEqual(len(hashes),372)
+        self.assertEqual(len(hashes['hashes']),372)
 
 
     def test_extract_guts(self):

singularity/tests/test_utils.py

@@ -107,35 +107,25 @@ def test_get_installdir(self):
         self.assertTrue(whereami.endswith('singularity'))
 
 
-    def test_zip_up(self):
-        '''zip up should create a zip file from a specified directory
-        '''
-        from singularity.utils import zip_up
-        zip_dir = tempfile.mkdtemp()
-        zip_name = "beetlejuice.zip"
-        zip_file = zip_dir(zip_dir, zip_name, output_folder=self.tmpdir)
-        self.assertTrue(os.path.exists(zip_file))
-
-
     def test_calculate_folder_size(self):
         '''ensure that calculation of folder size is accurate
         '''
         from singularity.utils import calculate_folder_size
         size_truncated = calculate_folder_size(self.tmpdir)
-        self.assertTrue(isinstance(size,int))
+        self.assertTrue(isinstance(size_truncated,int))
         size = calculate_folder_size(self.tmpdir,truncate=False)
         self.assertTrue(isinstance(size,float))
 
 
     def test_remove_uri(self):
         from singularity.utils import remove_uri
-        self.assertEqual('docker://ubuntu','ubuntu')
-        self.assertEqual('shub://vanessa/singularity-images','vanessa/singularity-images')
+        self.assertEqual(remove_uri('docker://ubuntu'),'ubuntu')
+        self.assertEqual(remove_uri('shub://vanessa/singularity-images'),'vanessa/singularity-images')
 
 
     def test_download_repo(self):
         from singularity.utils import download_repo
-        download_repo('https://github.com/singularityware/singularity',destination=self.tmpdir)
+        download_repo('https://github.com/singularityware/singularity',destination="%s/singularity" %self.tmpdir)
         self.assertTrue(os.path.exists("%s/singularity" %self.tmpdir))