From 3b6bb586e2a48fa8323fbdc8630e6524f0d50db5 Mon Sep 17 00:00:00 2001
From: dachshund <trishankkarthik@gmail.com>
Date: Fri, 6 Sep 2013 15:22:32 -0400
Subject: [PATCH] Remove unnecessary code from test_updater.

---
 tuf/tests/test_updater.py | 47 ---------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/tuf/tests/test_updater.py b/tuf/tests/test_updater.py
index f683517e..cdb853af 100755
--- a/tuf/tests/test_updater.py
+++ b/tuf/tests/test_updater.py
@@ -489,9 +489,6 @@ def test_3__update_metadata(self):
     """
     This unit test verifies the method's proper behaviour on the expected input.
     """
-
-    # Setup
-    original_download = tuf.download.safe_download
     
     #  Since client's '.../metadata/current' will need to have separate
     #  gzipped metadata file in order to test compressed file handling,
@@ -554,9 +551,6 @@ def test_3__update_metadata(self):
     os.remove(os.path.join(self.client_current_dir,'targets.txt.gz'))
     self._remove_target_from_targets_dir(added_target_1)
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 
   def test_1__update_fileinfo(self):
@@ -615,9 +609,6 @@ def test_3__update_metadata_if_changed(self):
     """
     This unit test verifies the method's proper behaviour on expected input.
     """
-
-    # Setup
-    original_download = tuf.download.safe_download
     
     #  To test updater._update_metadata_if_changed, 'targets' metadata file is
     #  going to be modified at the server's repository.
@@ -707,9 +698,6 @@ def test_3__update_metadata_if_changed(self):
     os.remove(os.path.join(self.client_current_dir, 'release.txt.gz'))
     self._remove_target_from_targets_dir(added_target_1)
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 
 
@@ -766,8 +754,6 @@ def test_2__ensure_not_expired(self):
 
 
   def test_4_refresh(self):
-    # Setup.
-    original_download = tuf.download.safe_download
     
     #  This unit test is based on adding an extra target file to the
     #  server and rebuilding all server-side metadata.  When 'refresh'
@@ -799,16 +785,10 @@ def test_4_refresh(self):
     self._mock_download_url_to_tempfileobj(self.all_role_paths)
     setup.build_server_repository(self.server_repo_dir, self.targets_dir)
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 
 
   def test_4__refresh_targets_metadata(self):
-
-    # Setup
-    original_download = tuf.download.safe_download
     
     # To test this method a target file would be added to a delegated role,
     # and metadata on the server side would be rebuilt.
@@ -864,9 +844,6 @@ def test_4__refresh_targets_metadata(self):
     shutil.rmtree(os.path.join(self.server_repo_dir, 'keystore'))
     setup.build_server_repository(self.server_repo_dir, self.targets_dir)
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 
 
@@ -893,9 +870,6 @@ def test_3__targets_of_role(self):
 
 
   def test_5_all_targets(self):
-
-   # Setup
-   original_download = tuf.download.safe_download
    
    # As with '_refresh_targets_metadata()', tuf.roledb._roledb_dict
    # has to be populated.  The 'tuf.download.safe_download' method
@@ -925,9 +899,6 @@ def test_5_all_targets(self):
    # targets in 'all_targets' should then be 6.
    self.assertTrue(len(all_targets) is 6)   
 
-   # RESTORE
-   tuf.download.safe_download = original_download
-
 
 
 
@@ -984,9 +955,6 @@ def test_6_target(self):
 
 
   def test_6_download_target(self):
-
-    # Setup:
-    original_download = tuf.download.safe_download
     
     # 'tuf.download.safe_download' method should be patched.
     target_rel_paths_src = self._get_list_of_target_paths(self.targets_dir)
@@ -1032,17 +1000,11 @@ def test_6_download_target(self):
     for mirror_name, mirror_info in mirrors.items():
       mirrors[mirror_name]['confined_target_dirs'] = ['']
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 
 
   def test_7_updated_targets(self):
     
-    # Setup:
-    original_download = tuf.download.safe_download
-    
     # In this test, client will have two target files.  Server will modify 
     # one of them.  As with 'all_targets' function, tuf.roledb._roledb_dict
     # has to be populated.  'tuf.download.safe_download' method
@@ -1103,17 +1065,11 @@ def test_7_updated_targets(self):
         msg = 'A file that need not to be updated is indicated as updated.'
         self.fail(msg)
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
     
 
 
   def test_8_remove_obsolete_targets(self):
     
-    # Setup:
-    original_download = tuf.download.safe_download
-    
     # This unit test should be last, because it removes target files from the
     # server's targets directory. It is done to avoid adding files, rebuilding 
     # and updating metadata. 
@@ -1162,9 +1118,6 @@ def test_8_remove_obsolete_targets(self):
     self.Repository.remove_obsolete_targets(dest_dir)
     self.assertTrue(os.listdir(dest_dir), 2)    
 
-    # RESTORE
-    tuf.download.safe_download = original_download
-
 
 def tearDownModule():
   # tearDownModule() is called after all the tests have run.