From 252fcc4716f546169294dd740c92e79d81731c47 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sun, 31 Oct 2021 18:01:14 +0200
Subject: [PATCH] git install test and tidying
---
core/TESTS/test_imports.py | 4 +++-
core/TESTS/tests.py | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py
index 54ea39c..2250e5f 100644
--- a/core/TESTS/test_imports.py
+++ b/core/TESTS/test_imports.py
@@ -121,9 +121,11 @@ class SubprocessTest(TestCase):
pass
def test_installs(self):
+ ''' Tests whether the external software is installed (but not whether it actually works)
+ '''
import troggle.settings as settings
- for i in [settings.CAVERN, settings.SURVEXPORT]:
+ for i in [settings.CAVERN, settings.SURVEXPORT, settings.GIT]:
# Define command as string and then split() into list format
cmd = f'which {i}'.split()
try:
diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py
index 7f254c8..eb2a429 100644
--- a/core/TESTS/tests.py
+++ b/core/TESTS/tests.py
@@ -114,7 +114,7 @@ class PageTests(TestCase):
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")
def test_expoweb_notfound(self):
- response = self.client.get('/handbook/zyxxypqrqx.html')
+ response = self.client.get('/handbook/_test_zyxxypqrqx.html')
content = response.content.decode()
self.assertEqual(response.status_code, 404)
ph = r'<h1>Page not found'
@@ -123,7 +123,7 @@ class PageTests(TestCase):
def test_expoweb_no_dir(self):
# slash where there should not be one
- response = self.client.get('/handbook/zyxxypqrqx/')
+ response = self.client.get('/handbook/_test_zyxxypqrqx/')
self.assertEqual(response.status_code, 200)
content = response.content.decode()
ph = r"<h1>Directory not found"
@@ -357,7 +357,7 @@ class PageTests(TestCase):
def test_page_photos_ok(self):
# Flat file tests.
- response = self.client.get('/photos/2018/PhilipSargent/corin.jpg')
+ response = self.client.get('/photos/2018/PhilipSargent/corin.jpg') #exists
if response.status_code != 200:
self.assertEqual(response.status_code, 302)
if response.status_code != 302:
@@ -366,10 +366,10 @@ class PageTests(TestCase):
def test_page_photos_not_ok(self):
# Flat file tests.
- response = self.client.get('/photos/2018/PhilipSargent/corin.jpeg')
+ response = self.client.get('/photos/2018/PhilipSargent/_corin.jpeg') # does not exist
self.assertEqual(response.status_code, 404)
content = response.content.decode()
- ph = r'<title>Page not found 2018/PhilipSargent/corin.jpeg</title>'
+ ph = r'<title>Page not found 2018/PhilipSargent/_corin.jpeg</title>'
phmatch = re.search(ph, content)
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")