Merge pull request #37 from yunstanford/fix-request-cache

Fix request cache

tests/test_get_remote_script_full.py

@@ -1,6 +1,7 @@
 import httpretty
 from uranium import get_remote_script
 from uranium.build import Build
+import pytest
 
 SCRIPT_URL = "http://www.myinternalwebsite.com/uranium_base.py"
 
@@ -29,3 +30,28 @@ def test_get_remote_script_with_cache(tmpdir):
     httpretty.disable()
     httpretty.reset()
     get_remote_script(SCRIPT_URL, cache_dir=tmpdir.strpath)
+
+
+def test_build_include_cache(tmpdir):
+    httpretty.enable()
+    httpretty.register_uri(httpretty.GET, SCRIPT_URL,
+                           body=REMOTE_SCRIPT)
+    build = Build(tmpdir.strpath)
+    build.URANIUM_CACHE_DIR = tmpdir.strpath
+    build.include(SCRIPT_URL, cache=True)
+    httpretty.disable()
+    httpretty.reset()
+    build.include(SCRIPT_URL, cache=True)
+
+
+def test_build_include_without_cache(tmpdir):
+    httpretty.enable()
+    httpretty.register_uri(httpretty.GET, SCRIPT_URL,
+                           body=REMOTE_SCRIPT)
+    build = Build(tmpdir.strpath)
+    build.URANIUM_CACHE_DIR = tmpdir.strpath
+    build.include(SCRIPT_URL, cache=False)
+    httpretty.disable()
+    httpretty.reset()
+    with pytest.raises(Exception):
+        build.include(SCRIPT_URL, cache=True)

uranium/build.py

@@ -44,7 +44,7 @@ class Build(object):
     URANIUM_CACHE_DIR = ".uranium"
     HISTORY_NAME = "history.json"
 
-    def __init__(self, root, config=None, with_sandbox=True):
+    def __init__(self, root, config=None, with_sandbox=True, cache_requests=True):
         self._config = config or Config()
         self._root = root
         self._executables = Executables(root)
@@ -54,7 +54,7 @@ def __init__(self, root, config=None, with_sandbox=True):
         self._tasks = Tasks()
         self._envvars = EnvironmentVariables()
         self._options = None
-        self._cache_requests = False
+        self._cache_requests = cache_requests
         self._history = History(
             os.path.join(self._root, self.URANIUM_CACHE_DIR, self.HISTORY_NAME)
         )