moved test cache, updated fetch_ait_metadta script to handle new Arch…

…iveItCollection objects
oduwsdl · Jun 28, 2018 · 3a4d525b6e7bf61d6365390b0bf2e0dbf73fcac7 · 3a4d525
1 parent ce5b2d0
commit 3a4d525b6e7bf61d6365390b0bf2e0dbf73fcac7
Unified Split

Showing with 12 additions and 18 deletions.

+5 −13 bin/fetch_ait_metadata

+7 −5 tests/archiveit_collection_test.py

BIN { → tests}/test_cache.sqlite
diff --git a/bin/fetch_ait_metadata b/bin/fetch_ait_metadata
@@ -2,6 +2,8 @@ import sys
 import os
 import logging
 import argparse
+import requests
+import requests_cache

 from aiu import ArchiveItCollection

@@ -30,23 +32,13 @@ if __name__ == "__main__":
        help="the output file in which to store the collection data",
        required=True
        )
-
-    parser.add_argument("--overwrite", dest="overwrite", default=False,
-        help="do not use cached data in working directory, overwrite it")
-
-
-    parser.add_argument("--working", dest="working_directory",
-        help="the directory containing the cached data stored while "
-        "working with the collection, default is /tmp/archiveit_data",
-        default="/tmp/archiveit_data")
    
    args = parser.parse_args()

-    logger.info("overwrite: {}".format(args.overwrite))
+    requests_cache.install_cache('fetch_ait_metadata_cache', backend='sqlite')
+    session = requests.Session()

-    aic = ArchiveItCollection( args.collection, 
-        working_directory=args.working_directory, 
-        use_cached=(not args.overwrite),
+    aic = ArchiveItCollection( args.collection, session=session,
        logger=logger )

    logger.info("saving output to {}".format(args.output))
diff --git a/tests/archiveit_collection_test.py b/tests/archiveit_collection_test.py
@@ -17,12 +17,14 @@

 pp = pprint.PrettyPrinter(indent=4)

+cachefile = "{}/test_cache".format(os.path.dirname(os.path.realpath(__file__)))
+
 class TestArchiveItCollection(unittest.TestCase):

    def test_nonexistent_collection(self):

        logger = logging.getLogger(__name__)
-        requests_cache.install_cache('test_cache', backend='sqlite')
+        requests_cache.install_cache(cachefile, backend='sqlite')
        session = requests.Session()

        aic = ArchiveItCollection(2, session=session, logger=logger)
@@ -37,7 +39,7 @@ def test_nonexistent_collection(self):
    def test_private_collection_12(self):

        logger = logging.getLogger(__name__)
-        requests_cache.install_cache('test_cache', backend='sqlite')
+        requests_cache.install_cache(cachefile, backend='sqlite')
        session = requests.Session()

        aic = ArchiveItCollection(12, session=session, logger=logger)
@@ -74,7 +76,7 @@ def test_private_collection_12(self):
    def test_public_collection_6820(self):

        logger = logging.getLogger(__name__)
-        requests_cache.install_cache('test_cache', backend='sqlite')
+        requests_cache.install_cache(cachefile, backend='sqlite')
        session = requests.Session()

        aic = ArchiveItCollection(6820, session=session, logger=logger)
@@ -115,7 +117,7 @@ def test_public_collection_6820(self):
    def test_public_collection_7000(self):

        logger = logging.getLogger(__name__)
-        requests_cache.install_cache('test_cache', backend='sqlite')
+        requests_cache.install_cache(cachefile, backend='sqlite')
        session = requests.Session()

        aic = ArchiveItCollection(7000, session=session, logger=logger)
@@ -197,7 +199,7 @@ def test_public_collection_5728(self):
        self.maxDiff = None

        logger = logging.getLogger(__name__)
-        requests_cache.install_cache('test_cache', backend='sqlite')
+        requests_cache.install_cache(cachefile, backend='sqlite')
        session = requests.Session()

        aic = ArchiveItCollection(5728, session=session, logger=logger)
diff --git a/test_cache.sqlite → tests/test_cache.sqlite b/test_cache.sqlite → tests/test_cache.sqlite