|
1 | 1 | from pathlib import Path
|
2 | 2 | from tempfile import mkdtemp
|
| 3 | +from sqlalchemy import MetaData |
3 | 4 |
|
4 |
| -from nomenklatura import settings |
| 5 | +from nomenklatura.db import get_engine |
5 | 6 | from nomenklatura.cache import Cache
|
6 | 7 | from nomenklatura.dataset import Dataset
|
7 | 8 |
|
8 |
| -DB_PATH = Path(mkdtemp()) / "test.sqlite3" |
9 |
| -settings.DB_URL = f"sqlite:///{DB_PATH.as_posix()}" |
| 9 | + |
| 10 | +def _make_cache(dataset: Dataset) -> Cache: |
| 11 | + db_path = Path(mkdtemp()) / "test.sqlite3" |
| 12 | + url = f"sqlite:///{db_path.as_posix()}" |
| 13 | + engine = get_engine(url) |
| 14 | + metadata = MetaData() |
| 15 | + return Cache(engine, metadata, dataset, create=True) |
10 | 16 |
|
11 | 17 |
|
12 | 18 | def test_cache():
|
13 | 19 | ds = Dataset.make({"name": "test", "title": "Test Case"})
|
14 |
| - cache = Cache.make_default(ds) |
| 20 | + cache = _make_cache(ds) |
15 | 21 | res = cache.get("name")
|
16 | 22 | assert res is None, res
|
17 | 23 | assert not cache.has("name")
|
@@ -39,13 +45,13 @@ def test_cache():
|
39 | 45 |
|
40 | 46 | def test_cache_utils():
|
41 | 47 | ds = Dataset.make({"name": "test", "title": "Test Case"})
|
42 |
| - cache = Cache.make_default(ds) |
| 48 | + cache = _make_cache(ds) |
43 | 49 | assert hash(cache) != 0
|
44 | 50 |
|
45 | 51 |
|
46 | 52 | def test_preload_cache():
|
47 | 53 | ds = Dataset.make({"name": "test", "title": "Test Case"})
|
48 |
| - cache = Cache.make_default(ds) |
| 54 | + cache = _make_cache(ds) |
49 | 55 | res = cache.get("name")
|
50 | 56 | cache.set("name", "TestCase")
|
51 | 57 | assert len(cache._preload) == 0, cache._preload
|
|
0 commit comments