WIP: Try harder to disable the cache for testing.

oasis-open · Jan 13, 2017 · 2dace26 · 2dace26
1 parent 2ff564c
commit 2dace26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/stix2validator/test/__init__.py b/stix2validator/test/__init__.py
@@ -27,6 +27,8 @@ def assertTrueWithOptions(self, instance, **kwargs):
             kwargs: Any number of keyword arguments to be passed to the
                     ValidationOptions constructor.
         """
+        if 'no_cache' not in kwargs:
+            kwargs['no_cache'] = True
         if 'strict' in kwargs:
             options = ValidationOptions(schema_dir=SCHEMA_DIR, **kwargs)
         else:
@@ -44,6 +46,8 @@ def assertFalseWithOptions(self, instance, **kwargs):
             kwargs: Any number of keyword arguments to be passed to the
                     ValidationOptions constructor.
         """
+        if 'no_cache' not in kwargs:
+            kwargs['no_cache'] = True
         if 'strict' in kwargs:
             options = ValidationOptions(schema_dir=SCHEMA_DIR, **kwargs)
         else:

diff --git a/stix2validator/validator.py b/stix2validator/validator.py
@@ -439,7 +439,9 @@ def schema_validate(instance, options):
         raise SchemaInvalidError('Invalid JSON schema: ' + str(e))
 
     # Cache data from external sources; used in some checks
-    if not options.no_cache:
+    if options.no_cache:
+        requests_cache.uninstall_cache()
+    else:
         requests_cache.install_cache(expire_after=datetime.timedelta(weeks=1))
     if options.refresh_cache:
         now = datetime.datetime.utcnow()