modified: analysis/reproduce/utils.py

	modified:   package/manage.py

Author: vsoch

singularity/analysis/reproduce/utils.py

@@ -27,6 +27,7 @@
 '''
 
 from singularity.cli import Singularity
+from .criteria import assess_content
 from singularity.logger import bot
 import hashlib
 import tarfile

singularity/package/manage.py

@@ -33,6 +33,7 @@
 from singularity.utils import get_installdir
 import json
 import sys
+import tempfile
 import zipfile
 
 install_dir = get_installdir()

singularity/tests/test_analysis_compare.py

@@ -91,15 +91,6 @@ def test_container_similarity(self):
         sim = calculate_similarity(self.container,self.comparator)
         self.assertTrue(sim['files.txt'] -0.4921837537163134 < 0.01)
 
-        print("Testing singularity.analysis.compare.compare_packages")
-        from singularity.analysis.compare import compare_packages
-        pwd = get_installdir()
-        pkg1 = "%s/tests/data/busybox-2016-02-16.img.zip" %(pwd)
-        pkg2 = "%s/tests/data/cirros-2016-01-04.img.zip" %(pwd)
-        comparison = compare_packages(pkg1,pkg2)
-        self.assertTrue('files.txt' in comparison)
-        self.assertTrue(isinstance(comparison['files.txt'],pandas.DataFrame))
-
     def test_information_coefficient(self):
         print("Testing singularity.analysis.metrics.information_coefficient")
         from singularity.analysis.metrics import information_coefficient

singularity/tests/test_package_utils.py

@@ -51,7 +51,7 @@ def tearDown(self):
     def test_calculate_folder_size(self):
         '''ensure that calculation of folder size is accurate
         '''
-        from singularity.package.utils import calculate_folder_size
+        from singularity.package import calculate_folder_size
         size_truncated = calculate_folder_size(self.tmpdir)
         self.assertTrue(isinstance(size_truncated,int))
 

singularity/tests/test_reproduce.py

@@ -61,17 +61,6 @@ def setUp(self):
     def tearDown(self):
         shutil.rmtree(self.tmpdir)
 
-    def test_get_memory_tar(self):
-        from singularity.analysis.reproduce import get_memory_tar
-        import io
-        import tarfile
-
-        print("Case 1: Testing functionality of get memory tar...")
-        file_obj,tar = get_memory_tar(self.image1)
-        self.assertTrue(isinstance(file_obj,io.BytesIO))
-        self.assertTrue(isinstance(tar,tarfile.TarFile))
-        file_obj.close()                
-
     def test_get_image_hashes(self):
         from singularity.analysis.reproduce import get_image_hashes, get_image_hash
 
@@ -144,8 +133,8 @@ def test_get_content_hashes(self):
 
 
     def test_extract_guts(self):
+        from singularity.analysis.utils import extract_guts
         from singularity.analysis.reproduce import (
-            extract_guts, 
             get_memory_tar,
             get_levels )
 

singularity/utils.py

@@ -60,7 +60,7 @@ def check_install(software=None, quiet=True):
     cmd = [software, '--version']
     try:
         version = run_command(cmd,software)
-    except FileNotFoundError:
+    except: # FileNotFoundError
         return False
     if version is not None:
         if quiet is False and version['return_code'] == 0: