fix wsgi file template

hjwp · hjwp · commit 43a2130bf021 · 2017-10-16T16:29:41.000+01:00
diff --git a/pythonanywhere/django_project.py b/pythonanywhere/django_project.py
@@ -116,7 +116,7 @@ def update_wsgi_file(self):
         print(snakesay(f'Updating wsgi file at {self.wsgi_file_path}'))
         template = open(Path(__file__).parent / 'wsgi_file_template.py').read()
         with open(self.wsgi_file_path, 'w') as f:
-            f.write(template.format(project_path=self.project_path))
+            f.write(template.format(project=self))
 
 
     def create_webapp(self, nuke):
diff --git a/pythonanywhere/wsgi_file_template.py b/pythonanywhere/wsgi_file_template.py
@@ -4,11 +4,11 @@
 import sys
 
 # Add your project directory to the sys.path
-project_path = {project_path!r}
-sys.path.insert(0, project_path)
+settings_path = '{project.settings_path.parent.parent}'
+sys.path.insert(0, settings_path)
 
 # Set environment variable to tell django where your settings.py is
-os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = '{project.settings_path.parent.name}.settings'
 
 # Set the 'application' variable to the Django wsgi app
 from django.core.wsgi import get_wsgi_application
diff --git a/tests/test_django_project.py b/tests/test_django_project.py
@@ -235,6 +235,7 @@ def more_nested_submodule():
 class TestFindDjangoFiles:
 
     def test_non_nested(self, fake_home, non_nested_submodule):
+
         project = DjangoProject('mydomain.com')
         shutil.copytree(non_nested_submodule, project.project_path)
         expected_settings_path = project.project_path / 'myproject/settings.py'
@@ -361,14 +362,49 @@ class TestUpdateWsgiFile:
 
     def test_updates_wsgi_file_from_template(self):
         project = DjangoProject('mydomain.com')
-        project.wsgi_file_path = tempfile.NamedTemporaryFile().name
+        project.wsgi_file_path = Path(tempfile.NamedTemporaryFile().name)
+        project.settings_path = Path('/path/to/settingsfolder/settings.py')
         template = open(Path(pythonanywhere.django_project.__file__).parent / 'wsgi_file_template.py').read()
 
         project.update_wsgi_file()
 
         with open(project.wsgi_file_path) as f:
             contents = f.read()
-        assert contents == template.format(project_path=project.project_path)
+        print(contents)
+        assert contents == template.format(project=project)
+
+
+    @pytest.mark.slowtest
+    def test_actually_produces_wsgi_file_that_can_import_project_non_nested(
+        self, fake_home, non_nested_submodule, virtualenvs_folder
+    ):
+        project = DjangoProject('mydomain.com')
+        shutil.copytree(non_nested_submodule, project.project_path)
+        project.create_virtualenv('3.6')
+        project.find_django_files()
+        project.wsgi_file_path = Path(tempfile.NamedTemporaryFile().name)
+
+        project.update_wsgi_file()
+
+        print(open(project.wsgi_file_path).read())
+        subprocess.check_output([project.virtualenv_path / 'bin/python', project.wsgi_file_path])
+
+
+    @pytest.mark.slowtest
+    def test_actually_produces_wsgi_file_that_can_import_nested_project(
+        self, fake_home, more_nested_submodule, virtualenvs_folder
+    ):
+        project = DjangoProject('mydomain.com')
+        shutil.copytree(more_nested_submodule, project.project_path)
+        project.create_virtualenv('3.6')
+        project.find_django_files()
+        project.wsgi_file_path = Path(tempfile.NamedTemporaryFile().name)
+
+        project.update_wsgi_file()
+
+        print(open(project.wsgi_file_path).read())
+        subprocess.check_output([project.virtualenv_path / 'bin/python', project.wsgi_file_path])
+
 
 
 
diff --git a/tests/test_pa_autoconfigure_django.py b/tests/test_pa_autoconfigure_django.py
@@ -79,7 +79,6 @@ def test_actually_works_against_example_repo(self, fake_home, virtualenvs_folder
 
 
 def xtest_todos():
-    assert not 'correct working dir / sys.path for nested projects'
     assert not 'existing-project sanity checks eg requirements empty'
     assert not 'nuke option shouldnt barf if nothing to nuke'
     assert not 'SECRET_KEY'
