alterware/BetterTwitFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change how config is loaded from env for testing

Browse Source
This commit is contained in:
Dylan 2023-07-02 17:54:49 +01:00
parent 828dbdca04
commit c098c0aad4
5 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/python-tests.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pytest-cov pip install pytest pytest-cov pytest-env
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Test with pytest - name: Test with pytest
run: | run: |

32
configHandler.py
View File

@ -1,26 +1,24 @@
import json import json
import os import os
if ('RUNNING_TESTS' in os.environ): if ('RUNNING_SERVERLESS' in os.environ and os.environ['RUNNING_SERVERLESS'] == '1'): # pragma: no cover
config= {"config":{"link_cache":"ram","database":"","table":"","color":"","appname": "vxTwitter","repo": "https://github.com/dylanpdx/BetterTwitFix","url": "https://vxtwitter.com","combination_method": "local","gifConvertAPI":""}}
elif ('RUNNING_SERVERLESS' in os.environ and os.environ['RUNNING_SERVERLESS'] == '1'): # pragma: no cover
config = { config = {
"config":{ "config":{
"link_cache":os.environ["VXTWITTER_LINK_CACHE"], "link_cache":os.getenv("VXTWITTER_LINK_CACHE","none"),
"database":os.environ["VXTWITTER_DATABASE"], "database":os.getenv("VXTWITTER_DATABASE",""),
"table":os.environ["VXTWITTER_CACHE_TABLE"], "table":os.getenv("VXTWITTER_CACHE_TABLE",""),
"color":os.environ["VXTWITTER_COLOR"], "color":os.getenv("VXTWITTER_COLOR",""),
"appname": os.environ["VXTWITTER_APP_NAME"], "appname": os.getenv("VXTWITTER_APP_NAME","vxTwitter"),
"repo": os.environ["VXTWITTER_REPO"], "repo": os.getenv("VXTWITTER_REPO","https://github.com/dylanpdx/BetterTwitFix"),
"url": os.environ["VXTWITTER_URL"], "url": os.getenv("VXTWITTER_URL","https://vxtwitter.com"),
"combination_method": os.environ["VXTWITTER_COMBINATION_METHOD"], # can either be 'local' or a URL to a server handling requests in the same format "combination_method": os.getenv("VXTWITTER_COMBINATION_METHOD","local"), # can either be 'local' or a URL to a server handling requests in the same format
"gifConvertAPI":os.environ["VXTWITTER_GIF_CONVERT_API"], "gifConvertAPI":os.getenv("VXTWITTER_GIF_CONVERT_API",""),
"workaroundTokens":os.environ["VXTWITTER_WORKAROUND_TOKENS"], "workaroundTokens":os.getenv("VXTWITTER_WORKAROUND_TOKENS",None),
"workaroundKeys":{ "workaroundKeys":{
"consumerKey":os.environ["VXTWITTER_WORKAROUND_CONSUMER_KEY"], "consumerKey":os.getenv("VXTWITTER_WORKAROUND_CONSUMER_KEY"),
"consumerSecret":os.environ["VXTWITTER_WORKAROUND_CONSUMER_SECRET"], "consumerSecret":os.getenv("VXTWITTER_WORKAROUND_CONSUMER_SECRET"),
"accessToken":os.environ["VXTWITTER_WORKAROUND_TOKEN"], "accessToken":os.getenv("VXTWITTER_WORKAROUND_TOKEN"),
"accessTokenSecret":os.environ["VXTWITTER_WORKAROUND_TOKEN_SECRET"] "accessTokenSecret":os.getenv("VXTWITTER_WORKAROUND_TOKEN_SECRET")
} }
} }
} }

8
pytest.ini Normal file
View File

@ -0,0 +1,8 @@
[pytest]
env =
VXTWITTER_LINK_CACHE=ram
VXTWITTER_APP_NAME=vxTwitter
VXTWITTER_REPO=https://github.com/dylanpdx/BetterTwitFix
VXTWITTER_URL=https://vxtwitter.com
VXTWITTER_COMBINATION_METHOD=local
RUNNING_SERVERLESS=1

1
test_vx.py
View File

@ -1,5 +1,4 @@
import os import os
os.environ["RUNNING_TESTS"]="1"
import twitfix,twExtract import twitfix,twExtract
import cache import cache

2
twExtract/__init__.py
View File

@ -27,6 +27,8 @@ def extractStatus_fallback(url):
if m is None: if m is None:
raise twExtractError.TwExtractError(400, "Extract error") raise twExtractError.TwExtractError(400, "Extract error")
twid = m.group(2) twid = m.group(2)
if config["config"]["workaroundTokens"] == None:
raise twExtractError.TwExtractError(400, "Extract error (no tokens defined)")
# get tweet # get tweet
tokens = config["config"]["workaroundTokens"].split(",") tokens = config["config"]["workaroundTokens"].split(",")
for authToken in tokens: for authToken in tokens: