xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues4 Pull Requests Projects1 Wiki Activity

git install test and tidying

Browse Source
This commit is contained in:
Philip Sargent 2021-10-31 18:01:14 +02:00
parent 36f92c5c9c
commit 252fcc4716
2 changed files with 8 additions and 6 deletions

4
core/TESTS/test_imports.py

@ -121,9 +121,11 @@ class SubprocessTest(TestCase):
pass pass
def test_installs(self): def test_installs(self):
''' Tests whether the external software is installed (but not whether it actually works)
'''
import troggle.settings as settings 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 # Define command as string and then split() into list format
cmd = f'which {i}'.split() cmd = f'which {i}'.split()
try: try:

10
core/TESTS/tests.py

@ -114,7 +114,7 @@ class PageTests(TestCase):
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'") self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")
def test_expoweb_notfound(self): def test_expoweb_notfound(self):
response = self.client.get('/handbook/zyxxypqrqx.html') response = self.client.get('/handbook/_test_zyxxypqrqx.html')
content = response.content.decode() content = response.content.decode()
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
ph = r'<h1>Page not found' ph = r'<h1>Page not found'
@ -123,7 +123,7 @@ class PageTests(TestCase):
def test_expoweb_no_dir(self): def test_expoweb_no_dir(self):
# slash where there should not be one # 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) self.assertEqual(response.status_code, 200)
content = response.content.decode() content = response.content.decode()
ph = r"<h1>Directory not found" ph = r"<h1>Directory not found"
@ -357,7 +357,7 @@ class PageTests(TestCase):
def test_page_photos_ok(self): def test_page_photos_ok(self):
# Flat file tests. # 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: if response.status_code != 200:
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
if response.status_code != 302: if response.status_code != 302:
@ -366,10 +366,10 @@ class PageTests(TestCase):
def test_page_photos_not_ok(self): def test_page_photos_not_ok(self):
# Flat file tests. # 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) self.assertEqual(response.status_code, 404)
content = response.content.decode() 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) phmatch = re.search(ph, content)
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'") self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")