Skip to content

Commit c8a2ad7

Browse files
authored
Fix tests and SAML logins (#15)
* Fix tests * Restore whitespace back * Keep xmlschema on 2.x See also getredash#7482 (reply in thread)
1 parent 1ff5f60 commit c8a2ad7

File tree

4 files changed

+29
-22
lines changed

4 files changed

+29
-22
lines changed

compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ x-redash-service: &redash-service
1212
env_file:
1313
- .env
1414
x-redash-environment: &redash-environment
15-
REDASH_HOST: http://localhost:5001
15+
REDASH_HOST: http://localhost:5000
1616
REDASH_LOG_LEVEL: "INFO"
1717
REDASH_REDIS_URL: "redis://redis:6379/0"
1818
REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
@@ -31,7 +31,7 @@ services:
3131
- postgres
3232
- redis
3333
ports:
34-
- "5001:5000"
34+
- "5000:5000"
3535
- "5678:5678"
3636
environment:
3737
<<: *redash-environment

poetry.lock

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pyjwt = "2.4.0"
5757
pyopenssl = "24.2.1"
5858
pypd = "1.1.0"
5959
pysaml2 = "7.3.1"
60-
pystache = "0.6.0"
60+
pystache = "0.6.8"
6161
python-dateutil = "2.8.0"
6262
python-dotenv = "0.19.2"
6363
pytz = ">=2019.3"
@@ -84,6 +84,7 @@ user-agents = "2.0"
8484
werkzeug = "2.3.8"
8585
wtforms = "2.2.1"
8686
xlsxwriter = "1.2.2"
87+
xmlschema = "2.5.1"
8788
tzlocal = "4.3.1"
8889
pyodbc = "5.1.0"
8990
debugpy = "^1.8.9"

tests/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
os.environ["REDASH_GOOGLE_CLIENT_ID"] = "dummy"
1313
os.environ["REDASH_GOOGLE_CLIENT_SECRET"] = "dummy"
1414
os.environ["REDASH_MULTI_ORG"] = "true"
15+
# Force relative URLs in tests by setting empty host
16+
os.environ["REDASH_HOST"] = ""
1517

1618
# Make sure rate limit is enabled
1719
os.environ["REDASH_RATELIMIT_ENABLED"] = "true"

0 commit comments

Comments
 (0)