From 175307773b9f87da8507c70bc70fa586f73abd57 Mon Sep 17 00:00:00 2001
From: "Philip Sargent (laptop)" <you@example.com>
Date: Tue, 2 May 2023 15:28:28 +0300
Subject: [PATCH] More fixes for laptop
---
core/TESTS/test_imports.py | 2 +-
core/TESTS/test_logins.py | 2 +-
core/TESTS/test_parsers.py | 3 +--
core/TESTS/tests.py | 3 +--
venv-trog.sh | 13 +++++++------
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py
index 28bd65e..2b23dd4 100644
--- a/core/TESTS/test_imports.py
+++ b/core/TESTS/test_imports.py
@@ -8,7 +8,7 @@ The simple redirections to files which exist, e.g. in
/expoweb/
/expofiles/
/expofiles/documents/
-etc. will test fine.
+etc. using parameters in localsettings such as PHOTOS_ROOT will test fine.
But paths like this:
/survey_scans/
diff --git a/core/TESTS/test_logins.py b/core/TESTS/test_logins.py
index ef9478b..8596205 100644
--- a/core/TESTS/test_logins.py
+++ b/core/TESTS/test_logins.py
@@ -103,7 +103,7 @@ class PostTests(TestCase):
self.expedition = e
def test_file_permissions(self):
- """Expect to be allowed to write to expofiles
+ """Expect to be allowed to write to SCANS_ROOT, DRAWINGS_DATA, SURVEX_DATA, EXPOWEB
Need to login first.
"""
c = self.client
diff --git a/core/TESTS/test_parsers.py b/core/TESTS/test_parsers.py
index 70f19cd..00b565e 100644
--- a/core/TESTS/test_parsers.py
+++ b/core/TESTS/test_parsers.py
@@ -6,8 +6,7 @@ so any path that relies on data being in the database will fail.
The simple redirections to files which exist, e.g. in
/expoweb/
-/expofiles/
-/expofiles/documents/
+/photos/
etc. will test fine.
But paths like this:
diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py
index 078a048..00a5021 100644
--- a/core/TESTS/tests.py
+++ b/core/TESTS/tests.py
@@ -6,8 +6,7 @@ so any path that relies on data being in the database will fail.
The simple redirections to files which exist, e.g. in
/expoweb/
-/expofiles/
-/expofiles/documents/
+/photos/
etc. will test fine.
But paths like this:
diff --git a/venv-trog.sh b/venv-trog.sh
index 2767570..42fac41 100644
--- a/venv-trog.sh
+++ b/venv-trog.sh
@@ -72,17 +72,18 @@ ln -s ${TROGDIR} troggle
ln -s ${TROGDIR}/../expoweb expoweb
ln -s ${TROGDIR}/../loser loser
ln -s ${TROGDIR}/../drawings drawings
+#ln -s ${TROGDIR}/../expofiles expofiles
# fudge for philip's machine
+if [ ! -d /mnt/d/EXPO ]; then
+ sudo mkdir /mnt/d
+ sudo mount -t drvfs D: /mnt/d
+fi
+
if [ -d ${TROGDIR}/../expofiles ]; then
ln -s ${TROGDIR}/../expofiles expofiles
else
- if [ ! -d /mnt/d/expofiles ]; then
- sudo mkdir /mnt/d
- sudo mount -t drvfs D: /mnt/d
- else
- ln -s /mnt/d/expofiles expofiles
- fi
+ ln -s /mnt/d/EXPO/expofiles expofiles
fi
echo "### Setting file permissions.. may take a while.."