Merge pull request #3387 from mmerickel/src-folder-refactor

refactor pyramid tests into a tests folder and package into a src folder

4 files changed, 30 insertions, 0 deletions

diff --git a/tests/pkgs/includeapp1/__init__.py b/tests/pkgs/includeapp1/__init__.py
new file mode 100644
index 000000000..eaeeb7ef6
--- /dev/null
+++ b/tests/pkgs/includeapp1/__init__.py
@@ -0,0 +1 @@
+# include app
diff --git a/tests/pkgs/includeapp1/root.py b/tests/pkgs/includeapp1/root.py
new file mode 100644
index 000000000..986356d81
--- /dev/null
+++ b/tests/pkgs/includeapp1/root.py
@@ -0,0 +1,10 @@
+from pyramid.response import Response
+
+def aview(request):
+    return Response('root')
+
+def configure(config):
+    config.add_view(aview)
+    config.include('tests.pkgs.includeapp1.two.configure')
+    config.commit()
+    
diff --git a/tests/pkgs/includeapp1/three.py b/tests/pkgs/includeapp1/three.py
new file mode 100644
index 000000000..973f91d99
--- /dev/null
+++ b/tests/pkgs/includeapp1/three.py
@@ -0,0 +1,10 @@
+from pyramid.response import Response
+
+def aview(request):
+    return Response('three')
+
+def configure(config):
+    config.add_view(aview, name='three')
+    config.include('tests.pkgs.includeapp1.two.configure') # should not cycle
+    config.add_view(aview) # will be overridden by root when resolved
+    
diff --git a/tests/pkgs/includeapp1/two.py b/tests/pkgs/includeapp1/two.py
new file mode 100644
index 000000000..6b8bb5539
--- /dev/null
+++ b/tests/pkgs/includeapp1/two.py
@@ -0,0 +1,9 @@
+from pyramid.response import Response
+
+def aview(request):
+    return Response('two')
+
+def configure(config):
+    config.add_view(aview, name='two')
+    config.include('tests.pkgs.includeapp1.three.configure')
+    config.add_view(aview) # will be overridden by root when resolved