Skip to content

Commit

Permalink
chore: Update test docs to postgresql; remove extraneous sqlite stuff (
Browse files Browse the repository at this point in the history
…#5400)

* chore: Update test docs to postgresql; remove extraneous sqlite stuff

* Reverted addition of settings_postgrestest.py to .gitignore
  • Loading branch information
jimfenton authored Mar 29, 2023
1 parent 01b4a91 commit 0f1a6c9
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 201 deletions.
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"args": [
"${workspaceFolder}/ietf/manage.py",
"test",
"--settings=settings_local_sqlitetest"
"--settings=settings_postgrestest"
],
"group": "test",
"presentation": {
Expand All @@ -68,7 +68,7 @@
"args": [
"${workspaceFolder}/ietf/manage.py",
"test",
"--settings=settings_local_sqlitetest",
"--settings=settings_postgrestest",
"--pattern=tests_js.py"
],
"group": "test",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ before activating a new release.
From a datatracker container, run the command:
```sh
./ietf/manage.py test --settings=settings_local_sqlitetest
./ietf/manage.py test --settings=settings_postgrestest
```

> You can limit the run to specific tests using the `--pattern` argument.
Expand Down
45 changes: 0 additions & 45 deletions bin/setupenv

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
# UID: 1001
# GID: 1001
# DATADIR: data
# DJANGO_SETTINGS_MODULE: settings_sqlitetest
# DJANGO_SETTINGS_MODULE: settings_postgrestest

# Uncomment the next line to use a non-root user for all processes.
# user: dev
Expand Down
81 changes: 0 additions & 81 deletions docker/configs/settings_local_sqlitetest.py

This file was deleted.

13 changes: 1 addition & 12 deletions docker/scripts/app-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,6 @@ else
fi
fi

if [ ! -f "$WORKSPACEDIR/ietf/settings_local_sqlitetest.py" ]; then
echo "Setting up a default settings_local_sqlitetest.py ..."
cp $WORKSPACEDIR/docker/configs/settings_local_sqlitetest.py $WORKSPACEDIR/ietf/settings_local_sqlitetest.py
else
echo "Using existing ietf/settings_local_sqlitetest.py file"
if ! cmp -s $WORKSPACEDIR/docker/configs/settings_local_sqlitetest.py $WORKSPACEDIR/ietf/settings_local_sqlitetest.py; then
echo "NOTE: Differences detected compared to docker/configs/settings_local_sqlitetest.py!"
echo "We'll assume you made these deliberately."
fi
fi

if [ ! -f "$WORKSPACEDIR/ietf/settings_local_vite.py" ]; then
echo "Setting up a default settings_local_vite.py ..."
cp $WORKSPACEDIR/docker/configs/settings_local_vite.py $WORKSPACEDIR/ietf/settings_local_vite.py
Expand Down Expand Up @@ -130,7 +119,7 @@ if [ -z "$EDITOR_VSCODE" ]; then
echo
echo "to start a development instance of the Datatracker."
echo
echo " ietf/manage.py test --settings=settings_sqlitetest"
echo " ietf/manage.py test --settings=settings_postgrestest"
echo
echo "to run all the python tests."
echo
Expand Down
1 change: 0 additions & 1 deletion ietf/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/settings_local.py
/settings_local.py.bak
/settings_local_debug.py
/settings_local_sqlitetest.py
/settings_local_vite.py
/settings_mysqldb.py
/settings_postgresqldb.py
Expand Down
58 changes: 0 additions & 58 deletions ietf/settings_sqlitetest.py

This file was deleted.

0 comments on commit 0f1a6c9

Please sign in to comment.