Merge branch '3627-selectable-projects' closes #3627

[arvados.git] / sdk / python / tests / arvados_testutil.py

diff --git a/sdk/python/tests/arvados_testutil.py b/sdk/python/tests/arvados_testutil.py
index cd86d80dc0d863f48b4fa692426e9ca4c0a24534..77146db470c1aa93bf0e175d1434a546ad18e6ea 100644 (file)
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@ -1,11 +1,18 @@
 #!/usr/bin/env python
 
 import errno
+import httplib
+import httplib2
 import os
 import shutil
 import tempfile
 import unittest
 
+def fake_httplib2_response(code, **headers):
+    headers.update(status=str(code),
+                   reason=httplib.responses.get(code, "Unknown Response"))
+    return httplib2.Response(headers)
+
 class ArvadosBaseTestCase(unittest.TestCase):
     # This class provides common utility functions for our tests.
 
@@ -27,20 +34,6 @@ class ArvadosBaseTestCase(unittest.TestCase):
             basedir = '.'
         return open(os.path.join(basedir, 'data', filename))
 
-
-class ArvadosKeepLocalStoreTestCase(ArvadosBaseTestCase):
-    def setUp(self):
-        super(ArvadosKeepLocalStoreTestCase, self).setUp()
-        self._orig_keep_local_store = os.environ.get('KEEP_LOCAL_STORE')
-        os.environ['KEEP_LOCAL_STORE'] = self.make_tmpdir()
-
-    def tearDown(self):
-        if self._orig_keep_local_store is None:
-            del os.environ['KEEP_LOCAL_STORE']
-        else:
-            os.environ['KEEP_LOCAL_STORE'] = self._orig_keep_local_store
-        super(ArvadosKeepLocalStoreTestCase, self).tearDown()
-
     def build_directory_tree(self, tree):
         tree_root = self.make_tmpdir()
         for leaf in tree: