cleanup test_nbmanager

use class setUp / teardown instead of the same context manager in every test

IPython/html/services/notebooks/tests/test_nbmanager.py

@@ -61,7 +61,10 b' class TestNotebookManager(TestCase):'
     def setUp(self):
         self._temp_dir = TemporaryDirectory()
         self.td = self._temp_dir.name
-        self.nbm = FileNotebookManager(notebook_dir=self.td, log=logging.getLogger())
+        self.notebook_manager = FileNotebookManager(
+            notebook_dir=self.td,
+            log=logging.getLogger()
+        )
     
     def tearDown(self):
         self._temp_dir.cleanup()
@@ -83,7 +86,7 b' class TestNotebookManager(TestCase):'
         nb.worksheets[0].cells.append(cell)
     
     def new_notebook(self):
-        nbm = self.nbm
+        nbm = self.notebook_manager
         model = nbm.create_notebook()
         name = model['name']
         path = model['path']
@@ -96,10 +99,7 b' class TestNotebookManager(TestCase):'
         return nb, name, path
     
     def test_create_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in root directory
-            # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
+        nm = self.notebook_manager
             # Test in root directory
             model = nm.create_notebook()
             assert isinstance(model, dict)
@@ -119,10 +119,8 b' class TestNotebookManager(TestCase):'
             self.assertEqual(model['path'], sub_dir.strip('/'))
 
     def test_get_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in root directory
+        nm = self.notebook_manager
             # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
             model = nm.create_notebook()
             name = model['name']
             path = model['path']
@@ -148,10 +146,8 b' class TestNotebookManager(TestCase):'
             self.assertEqual(model2['path'], sub_dir.strip('/'))
             
     def test_update_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in root directory
+        nm = self.notebook_manager
             # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
             model = nm.create_notebook()
             name = model['name']
             path = model['path']
@@ -188,10 +184,8 b' class TestNotebookManager(TestCase):'
             self.assertRaises(HTTPError, nm.get_notebook, name, path)
 
     def test_save_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in the root directory
+        nm = self.notebook_manager
             # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
             model = nm.create_notebook()
             name = model['name']
             path = model['path']
@@ -225,9 +219,9 b' class TestNotebookManager(TestCase):'
             self.assertEqual(model['path'], sub_dir.strip('/'))
 
     def test_save_notebook_with_script(self):
-        with TemporaryDirectory() as td:
+        nm = self.notebook_manager
             # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
+        model = nm.create_notebook()
             nm.save_script = True
             model = nm.create_notebook()
             name = model['name']
@@ -240,17 +234,13 b' class TestNotebookManager(TestCase):'
             model = nm.save_notebook(full_model, name, path)
 
             # Check that the script was created
-            py_path = os.path.join(td, os.path.splitext(name)[0]+'.py')
+        py_path = os.path.join(nm.notebook_dir, os.path.splitext(name)[0]+'.py')
             assert os.path.exists(py_path), py_path
 
     def test_delete_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in the root directory
+        nm = self.notebook_manager
             # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
-            model = nm.create_notebook()
-            name = model['name']
-            path = model['path']
+        nb, name, path = self.new_notebook()
             
             # Delete the notebook
             nm.delete_notebook(name, path)
@@ -259,13 +249,10 b' class TestNotebookManager(TestCase):'
             self.assertRaises(HTTPError, nm.get_notebook, name, path)
     
     def test_copy_notebook(self):
-        with TemporaryDirectory() as td:
-            # Test in the root directory
-            # Create a notebook
-            nm = FileNotebookManager(notebook_dir=td)
+        nm = self.notebook_manager
             path = u'å b'
             name = u'nb √.ipynb'
-            os.mkdir(os.path.join(td, path))
+        os.mkdir(os.path.join(nm.notebook_dir, path))
             orig = nm.create_notebook({'name' : name}, path=path)
             
             # copy with unspecified name
@@ -277,18 +264,20 b' class TestNotebookManager(TestCase):'
             self.assertEqual(copy2['name'], u'copy 2.ipynb')
     
     def test_trust_notebook(self):
-        nbm = self.nbm
+        nbm = self.notebook_manager
         nb, name, path = self.new_notebook()
         
         untrusted = nbm.get_notebook(name, path)['content']
-        assert not nbm.notary.check_signature(untrusted)
+        assert not nbm.notary.check_cells(untrusted)
         
+        # print(untrusted)
         nbm.trust_notebook(name, path)
         trusted = nbm.get_notebook(name, path)['content']
-        assert nbm.notary.check_signature(trusted)
+        # print(trusted)
+        assert nbm.notary.check_cells(trusted)
     
     def test_mark_trusted_cells(self):
-        nbm = self.nbm
+        nbm = self.notebook_manager
         nb, name, path = self.new_notebook()
         
         nbm.mark_trusted_cells(nb, name, path)
@@ -298,13 +287,12 b' class TestNotebookManager(TestCase):'
         
         nbm.trust_notebook(name, path)
         nb = nbm.get_notebook(name, path)['content']
-        nbm.mark_trusted_cells(nb, name, path)
         for cell in nb.worksheets[0].cells:
             if cell.cell_type == 'code':
                 assert cell.trusted
 
     def test_check_and_sign(self):
-        nbm = self.nbm
+        nbm = self.notebook_manager
         nb, name, path = self.new_notebook()
         
         nbm.mark_trusted_cells(nb, name, path)