updating views test, but will need update (to not require sudo) to work

Author: vsoch

README.md

@@ -1,5 +1,7 @@
 # Singularity Python
 
+[![Build Status](https://travis-ci.org/singularityware/singularity-python.svg?branch=master)](https://travis-ci.org/singularityware/singularity-python)
+
 This is a python command line tool for working with [Singularity](singularityware.github.io) containers, specifically providing functions to visualize, package, and containers. Currently, most functions use Singularity on the commnd line, and require sudo, and this is expected to change when the software is updated to obtain image folders and files without an export that uses `Singularity export`.
 
 The Singularity-Python code is licensed under the MIT open source license, which is a highly permissive license that places few limits upon reuse. This ensures that the code will be usable by the greatest number of researchers, in both academia and industry. 

singularity/testing/test_views.py

@@ -5,9 +5,24 @@
 
 """
 
-from numpy.testing import assert_array_equal, assert_almost_equal, assert_equal
-from singularity.utils import get_installdir, read_file, write_file
-from singularity.views import tree, make_package_tree
+from numpy.testing import (
+    assert_array_equal, 
+    assert_almost_equal, 
+    assert_equal
+)
+
+from singularity.utils import (
+    get_installdir, 
+    read_file, 
+    write_file
+)
+
+from singularity.views import (
+    container_tree,
+    calculate_similarity,
+    container_similarity
+)
+
 from singularity.package import load_package
 import unittest
 import tempfile
@@ -22,9 +37,6 @@ def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
         self.image1 = "%s/testing/data/busybox-2016-02-16.img" %(self.pwd)
         self.image2 = "%s/testing/data/cirros-2016-01-04.img" %(self.pwd)
-        self.pkg1 = "%s/testing/data/busybox-2016-02-16.img.zip" %(self.pwd)
-        self.pkg2 = "%s/testing/data/cirros-2016-01-04.img.zip" %(self.pwd)
-
 
     def tearDown(self):
         shutil.rmtree(self.tmpdir)
@@ -39,11 +51,11 @@ def test_tree(self):
 
         # This template has actual paths to static files instead of Flask
         html_template = " ".join(read_file("%s/templates/container_tree_circleci.html" %(self.pwd)))
-        viz = tree(self.pkg1)
+        viz = container_tree(self.image1)
         # Make replacements in the template
         html_template = html_template.replace("{{ graph | safe }}",json.dumps(viz["graph"]))
         html_template = html_template.replace("{{ files | safe }}",json.dumps(viz["files"]))
-        container_name = os.path.basename(self.pkg1).split(".")[0]
+        container_name = os.path.basename(self.image1).split(".")[0]
         html_template = html_template.replace("{{ container_name }}",container_name)
         write_file("tree.html",html_template)
         views["Similarity Tree"] = 'tree.html'
@@ -55,17 +67,6 @@ def test_tree(self):
         html_template = " ".join(read_file("%s/templates/index_circleci.html" %(self.pwd)))
         html_template = html_template.replace("{{ links }}",links)
         write_file("index.html",html_template)
-
-        # Test the package tree
-        pkg1_includes = load_package(self.pkg1)
-        package_tree = make_package_tree(folders=pkg1_includes["folders.txt"],
-                                         files=pkg1_includes["folders.txt"])
-        self.assertTrue(package_tree['depth']==3)
-        self.assertTrue(isinstance(package_tree['lookup'],dict))
 
-        # Remove temporary package
-        image1_extraction = pkg1_includes[os.path.basename(self.image1)]
-        shutil.rmtree(os.path.dirname(image1_extraction))
-
 if __name__ == '__main__':
     unittest.main()