test fixes for previous commits

Author: kmodexc

tests/test_tucache.py

@@ -32,37 +32,35 @@ async def tolist(_iter):
 		data += i
 	return data
 def test_clean_start():
-	cache = TuCache(_dir="pytest-web-cache")
+	cache = TuCache(webcache_dir="pytest-web-cache")
 	cache.clean()
 def test_Clean_Dummy():
-	cache = TuCache(_dir="pytest-web-cache")
+	cache = TuCache(webcache_dir="pytest-web-cache")
 	cache.cache = CacheForTests()
 	assert not cache.cache._clean
 	cache.clean()
 	assert cache.cache._clean
 def test_Get_Check_Urls():
-	cache = TuCache(_dir="pytest-web-cache")
+	cache = TuCache(webcache_dir="pytest-web-cache")
 	cache.cache = CacheForTests()
 	data = asyncio.run(cache.get_url('Unit'))
 	assert len(cache.cache.urls) == 1
 	assert cache.cache.urls[0] == DUMMY_URL
 def test_Get_Check_Return():
-	cache = TuCache(_dir="pytest-web-cache")
+	cache = TuCache(webcache_dir="pytest-web-cache")
 	cache.cache = CacheForTests()
 	data = asyncio.run(cache.get_url('Unit'))
 	assert len(data) == 2
 	assert data[0]["val"] == 1
 	assert data[1]["val"] == 1
 def test_Get_return_hashes():
-	cache = TuCache(_dir="pytest-web-cache")
-	cache.cache.return_only_cache_files = True
+	cache = TuCache(webcache_dir="pytest-web-cache",return_only_cache_files=True)
 	cache.clean()
 	data = asyncio.run(cache.get_url('Unit'))
 	assert len(data) == 1
 	assert data[0] == "79fb93d6b6a0d19f2fb3b55fc8e19489.json"
 def test_getcandata_check_urls():
-	cache = TuCache(_dir="pytest-web-cache")
-	cache.tdelta_end = datetime(2021,11,15,10,0,0,0)
+	cache = TuCache(webcache_dir="pytest-web-cache",tdelta_end=datetime(2021,11,15,10,0,0,0))
 	cache.cache = CacheForTests()
 	_it,_l = cache.get_candata("3331359",tdelta=100)
 	assert _l == 4

tests/test_webcache.py

@@ -1,3 +1,4 @@
+from tabnanny import verbose
 from pytrackunit.webcache import WebCache, get_from_file
 import os.path
 import hashlib
@@ -9,38 +10,40 @@
 DUMMY_URL = 'https://pokeapi.co/api/v2/pokemon/ditto'
 DUMMY_URL_HASH = "70551c7a431274e4617c94ad307346d2"
 
+CACHE_DIR = "pytest-web-cache"
+
 # This will remove error "message loop closed" under windows
 if system() == "Windows":
 	asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 def get_hash(x):
 	return hashlib.sha256(x.encode('ascii')).hexdigest()
 def test_Clean():
-	cache = WebCache(_dir="pytest-web-cache")
+	cache = WebCache(webcache_dir=CACHE_DIR,verbose=True)
 	cache.clean()
-	assert os.path.exists(cache.dir)
-	assert len(listdir(cache.dir)) == 0
-	fname = os.path.join(cache.dir,"asdf.txt")
+	assert os.path.exists(CACHE_DIR)
+	assert len(listdir(CACHE_DIR)) == 0
+	fname = os.path.join(CACHE_DIR,"asdf.txt")
 	f = open(fname,"w",encoding='utf8')
 	f.write('{"data": "data"}')
 	f.flush()
 	f.close()
 	cache.clean()
-	assert os.path.exists(cache.dir)
-	assert len(listdir(cache.dir)) == 0
+	assert os.path.exists(CACHE_DIR)
+	assert len(listdir(CACHE_DIR)) == 0
 	cache.clean()
-	assert os.path.exists(cache.dir)
-	assert len(listdir(cache.dir)) == 0
+	assert os.path.exists(CACHE_DIR)
+	assert len(listdir(CACHE_DIR)) == 0
 def test_GetFromFile_Clean():
-	cache = WebCache(_dir="pytest-web-cache")
+	cache = WebCache(webcache_dir=CACHE_DIR)
 	cache.clean()
 	data = asyncio.run(get_from_file('asdf'))
 	assert data is None
 	cache.clean()
 def test_GetFromFile_WithFile():
-	cache = WebCache(_dir="pytest-web-cache")
+	cache = WebCache(webcache_dir=CACHE_DIR)
 	cache.clean()
-	fname = os.path.join(cache.dir,"asdf.txt")
+	fname = os.path.join(CACHE_DIR,"asdf.txt")
 	f = open(fname,"w",encoding='utf8')
 	f.write('{"data": "data"}')
 	f.flush()
@@ -50,9 +53,9 @@ def test_GetFromFile_WithFile():
 	assert data["data"] == "data"
 	cache.clean()
 def test_GetFromFile_With_incorrect_File():
-	cache = WebCache(_dir="pytest-web-cache",verbose=True)
+	cache = WebCache(webcache_dir=CACHE_DIR,verbose=True)
 	cache.clean()
-	fname = os.path.join(cache.dir,"asdf.txt")
+	fname = os.path.join(CACHE_DIR,"asdf.txt")
 	f = open(fname,"w",encoding='utf8')
 	f.write('{"data": "data"')
 	f.flush()
@@ -61,35 +64,35 @@ def test_GetFromFile_With_incorrect_File():
 	data = asyncio.run(get_from_file(fname))
 	assert data is None
 def test_Get_Clean():
-	cache = WebCache(_dir="pytest-web-cache")
+	cache = WebCache(webcache_dir=CACHE_DIR)
 	cache.clean()
 	data = asyncio.run(cache.get(DUMMY_URL))
 	cache.clean()
 def test_Get_WithFile():
-	cache = WebCache(_dir="pytest-web-cache")
+	cache = WebCache(webcache_dir=CACHE_DIR)
 	cache.clean()
 	data = asyncio.run(cache.get(DUMMY_URL))
 	assert data["abilities"][0]["ability"]["name"] == "limber"
 	data = asyncio.run(cache.get(DUMMY_URL))
 	assert data["abilities"][0]["ability"]["name"] == "limber"
 	cache.clean()
 def test_Get_no_file_read():
-	cache = WebCache(_dir="pytest-web-cache",dont_read_files = True)
+	cache = WebCache(webcache_dir=CACHE_DIR,dont_read_files = True)
 	cache.clean()
 	data = asyncio.run(cache.get(DUMMY_URL))
 	assert data["abilities"][0]["ability"]["name"] == "limber"
 	data = asyncio.run(cache.get(DUMMY_URL))
 	assert data == {}
 	cache.clean()
 def test_Get_write_file():
-	cache = WebCache(_dir="pytest-web-cache",verbose=True)
-	fname = os.path.join(cache.dir,DUMMY_URL_HASH+".json")
+	cache = WebCache(webcache_dir=CACHE_DIR,verbose=True)
+	fname = os.path.join(CACHE_DIR,DUMMY_URL_HASH+".json")
 	cache.clean()
 	data1 = asyncio.run(cache.get(DUMMY_URL))
 	data2 = asyncio.run(get_from_file(fname))
 	assert data2["abilities"][0]["ability"]["name"] == "limber"
 def test_Get_verbose(capsys):
-	cache = WebCache(_dir="pytest-web-cache",verbose=True)
+	cache = WebCache(webcache_dir=CACHE_DIR,verbose=True)
 	cache.clean()
 	data1 = asyncio.run(cache.get(DUMMY_URL))
 	captured = capsys.readouterr()
@@ -101,7 +104,7 @@ def test_Get_verbose(capsys):
 	assert captured.out.split('\n')[1].split(' ')[0] == DUMMY_URL
 	assert captured.out.split('\n')[1].split(' ')[2] == "C"
 def test_return_hashes():
-	cache = WebCache(_dir="pytest-web-cache",verbose=True,return_only_cache_files = True)
+	cache = WebCache(webcache_dir=CACHE_DIR,verbose=True,return_only_cache_files = True)
 	cache.clean()
 	data = asyncio.run(cache.get(DUMMY_URL))
 	assert data == DUMMY_URL_HASH+".json"