You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/12/17 22:28:08 UTC
[1/4] git commit: [#6388] add logging stub for Timermiddleware
verbose logging
Updated Branches:
refs/heads/db/6388 a286ebd6d -> 97755d126
[#6388] add logging stub for Timermiddleware verbose logging
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/876e4eec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/876e4eec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/876e4eec
Branch: refs/heads/db/6388
Commit: 876e4eec6415eada47eda10b185748d5504f9ac9
Parents: a286ebd
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Dec 17 17:53:56 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Dec 17 17:53:56 2013 +0000
----------------------------------------------------------------------
Allura/development.ini | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/876e4eec/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 930bbb8..5a3d83f 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -333,7 +333,7 @@ override_root = task
# http://docs.python.org/lib/logging-config-fileformat.html
[loggers]
-keys = root, allura, sqlalchemy, paste, amqp, pylons, taskdstatus, timermiddleware
+keys = root, allura, sqlalchemy, paste, amqp, pylons, taskdstatus, timermiddleware, tmw_details
[handlers]
keys = console, stats, taskdstatus, timermiddleware
@@ -374,6 +374,12 @@ level = INFO
qualname = pylons
handlers =
+[logger_tmw_details]
+# DEBUG will include every instrumented call in our logging
+level = INFO
+qualname = timermiddleware
+handlers =
+
[logger_taskdstatus]
level = INFO
qualname = taskdstatus
[4/4] git commit: [#6388] start working on script
Posted by br...@apache.org.
[#6388] start working on script
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/97755d12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/97755d12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/97755d12
Branch: refs/heads/db/6388
Commit: 97755d126b334ddaa2ca0ee28a2c1c9839ccb91d
Parents: c4f5bb7
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Dec 17 21:27:56 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Dec 17 21:27:56 2013 +0000
----------------------------------------------------------------------
scripts/perf/call_count.py | 65 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/97755d12/scripts/perf/call_count.py
----------------------------------------------------------------------
diff --git a/scripts/perf/call_count.py b/scripts/perf/call_count.py
new file mode 100755
index 0000000..96b8b20
--- /dev/null
+++ b/scripts/perf/call_count.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from pylons import tmpl_context as c
+
+from allura import model as M
+from allura.lib.helpers import push_config, push_context
+from allura.tests import TestController
+
+from forgewiki import model as WM
+
+
+def main():
+ test = TestController()
+ thread = setup(test)
+ load_page(test, thread)
+
+
+def setup(test):
+ # includes setting up mim
+ test.setUp()
+ # automagically instantiate the app
+ test.app.get('/wiki/')
+
+ project = M.Project.query.get(shortname='test')
+ app = project.app_instance('wiki')
+
+ page = WM.Page.query.get(app_config_id=app.config._id, title='Home')
+ thread = page.discussion_thread
+ # create 3 posts by 2 users
+ with push_config(c, user=M.User.query.get(username='test-admin'),
+ app=app,
+ project=project):
+ thread.add_post(text='This is very helpful')
+ thread.add_post(text="But it's not **super** helpful")
+ with push_config(c, user=M.User.query.get(username='test-user')):
+ thread.add_post(text='I disagree')
+
+ return thread
+
+
+def load_page(test, thread):
+
+ print test.app.get('/p/test/wiki/_discuss/thread/{}/'.format(thread._id),
+ extra_environ=dict(username='*anonymous'))
+ test.tearDown()
+
+if __name__ == '__main__':
+ main()
[3/4] git commit: [#6388] always load test.ini from the Allura/ dir
Posted by br...@apache.org.
[#6388] always load test.ini from the Allura/ dir
This allows us to not duplicate test.ini in every dir (any local
changes required should be accomplished via mocks).
We can also can run functional tests from any directory now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c4f5bb79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c4f5bb79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c4f5bb79
Branch: refs/heads/db/6388
Commit: c4f5bb79aac5a8450515ccbb08ecbb0eb07e7d57
Parents: ddc7c5d
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Dec 17 19:17:37 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Dec 17 19:17:37 2013 +0000
----------------------------------------------------------------------
AlluraTest/alluratest/controller.py | 3 +-
ForgeActivity/test.ini | 69 --------------------------------
ForgeBlog/test.ini | 67 -------------------------------
ForgeChat/test.ini | 67 -------------------------------
ForgeDiscussion/test.ini | 67 -------------------------------
ForgeGit/test.ini | 67 -------------------------------
ForgeImporters/test.ini | 67 -------------------------------
ForgeLink/test.ini | 67 -------------------------------
ForgeSVN/test.ini | 67 -------------------------------
ForgeShortUrl/test.ini | 67 -------------------------------
ForgeTracker/test.ini | 67 -------------------------------
ForgeUserStats/test.ini | 67 -------------------------------
ForgeWiki/test.ini | 67 -------------------------------
13 files changed, 2 insertions(+), 807 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/AlluraTest/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
index 4c3c4e5..62cc03c 100644
--- a/AlluraTest/alluratest/controller.py
+++ b/AlluraTest/alluratest/controller.py
@@ -33,6 +33,7 @@ from webob import Request, Response
import ew
from ming.orm import ThreadLocalORMSession
import ming.orm
+import pkg_resources
from allura import model as M
import allura.lib.security
@@ -56,7 +57,7 @@ def get_config_file(config=None):
try:
conf_dir = tg.config.here
except AttributeError:
- conf_dir = os.getcwd()
+ conf_dir = pkg_resources.resource_filename('Allura', '..')
return os.path.join(conf_dir, config)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeActivity/test.ini
----------------------------------------------------------------------
diff --git a/ForgeActivity/test.ini b/ForgeActivity/test.ini
deleted file mode 100644
index b522f20..0000000
--- a/ForgeActivity/test.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-activitystream.recording.enabled = true
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgeactivity
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeBlog/test.ini
----------------------------------------------------------------------
diff --git a/ForgeBlog/test.ini b/ForgeBlog/test.ini
deleted file mode 100644
index e29c4a3..0000000
--- a/ForgeBlog/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgeblog
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeChat/test.ini
----------------------------------------------------------------------
diff --git a/ForgeChat/test.ini b/ForgeChat/test.ini
deleted file mode 100644
index 55b5d76..0000000
--- a/ForgeChat/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgechat
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeDiscussion/test.ini
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/test.ini b/ForgeDiscussion/test.ini
deleted file mode 100644
index 1d2afd7..0000000
--- a/ForgeDiscussion/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgediscussion
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeGit/test.ini
----------------------------------------------------------------------
diff --git a/ForgeGit/test.ini b/ForgeGit/test.ini
deleted file mode 100644
index fa59b5b..0000000
--- a/ForgeGit/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgegit
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeImporters/test.ini
----------------------------------------------------------------------
diff --git a/ForgeImporters/test.ini b/ForgeImporters/test.ini
deleted file mode 100644
index 0d39a4e..0000000
--- a/ForgeImporters/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgeshorturl
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeLink/test.ini
----------------------------------------------------------------------
diff --git a/ForgeLink/test.ini b/ForgeLink/test.ini
deleted file mode 100644
index 5b959b0..0000000
--- a/ForgeLink/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgelink
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeSVN/test.ini
----------------------------------------------------------------------
diff --git a/ForgeSVN/test.ini b/ForgeSVN/test.ini
deleted file mode 100644
index 426aec5..0000000
--- a/ForgeSVN/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgesvn
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeShortUrl/test.ini
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/test.ini b/ForgeShortUrl/test.ini
deleted file mode 100644
index 0d39a4e..0000000
--- a/ForgeShortUrl/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgeshorturl
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeTracker/test.ini
----------------------------------------------------------------------
diff --git a/ForgeTracker/test.ini b/ForgeTracker/test.ini
deleted file mode 100644
index 0202bfd..0000000
--- a/ForgeTracker/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgetracker
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeUserStats/test.ini
----------------------------------------------------------------------
diff --git a/ForgeUserStats/test.ini b/ForgeUserStats/test.ini
deleted file mode 100644
index 669f24a..0000000
--- a/ForgeUserStats/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgeuserstats
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c4f5bb79/ForgeWiki/test.ini
----------------------------------------------------------------------
diff --git a/ForgeWiki/test.ini b/ForgeWiki/test.ini
deleted file mode 100644
index 5ee4f32..0000000
--- a/ForgeWiki/test.ini
+++ /dev/null
@@ -1,67 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# allura - TurboGears 2 testing environment configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
-[DEFAULT]
-debug = true
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:../Allura/test.ini
-
-[app:main_with_amqp]
-use = config:../Allura/test.ini#main_with_amqp
-
-[loggers]
-keys = root, allura, tool
-
-[handlers]
-keys = test
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = INFO
-handlers = test
-
-[logger_allura]
-level = DEBUG
-handlers =
-qualname = allura
-
-[logger_tool]
-level = DEBUG
-handlers =
-qualname = forgewiki
-
-[handler_test]
-class = FileHandler
-args = ('test.log',)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S
[2/4] git commit: [#6388] remove unused main_without_authn (was part
of TG quickstart)
Posted by br...@apache.org.
[#6388] remove unused main_without_authn (was part of TG quickstart)
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ddc7c5d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ddc7c5d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ddc7c5d0
Branch: refs/heads/db/6388
Commit: ddc7c5d07a7c36d9a1d18a7a063b83157ddd61bd
Parents: 876e4ee
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Dec 17 18:47:15 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Dec 17 18:47:15 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/__init__.py | 2 --
Allura/test.ini | 4 ----
AlluraTest/alluratest/controller.py | 2 +-
ForgeActivity/test.ini | 3 ---
ForgeBlog/test.ini | 3 ---
ForgeChat/test.ini | 3 ---
ForgeDiscussion/test.ini | 3 ---
ForgeGit/test.ini | 3 ---
ForgeImporters/test.ini | 3 ---
ForgeLink/test.ini | 3 ---
ForgeSVN/test.ini | 3 ---
ForgeShortUrl/test.ini | 3 ---
ForgeTracker/test.ini | 3 ---
ForgeUserStats/test.ini | 3 ---
ForgeWiki/test.ini | 3 ---
15 files changed, 1 insertion(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/Allura/allura/tests/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/__init__.py b/Allura/allura/tests/__init__.py
index d96e4ad..3fb7e93 100644
--- a/Allura/allura/tests/__init__.py
+++ b/Allura/allura/tests/__init__.py
@@ -27,5 +27,3 @@ class TestController(alluratest.controller.TestController):
Base functional test case for the controllers.
"""
-
- application_under_test = 'main_without_authn'
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/Allura/test.ini
----------------------------------------------------------------------
diff --git a/Allura/test.ini b/Allura/test.ini
index 99ca324..c18caab 100644
--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -125,10 +125,6 @@ markdown_render_max_length = 40000
user_message.time_interval = 3600
user_message.max_messages = 200
-[app:main_without_authn]
-use = main
-skip_authentication = True
-
[app:main_with_amqp]
use = main
# Use test RabbitMQ vhost
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/AlluraTest/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
index e382a64..4c3c4e5 100644
--- a/AlluraTest/alluratest/controller.py
+++ b/AlluraTest/alluratest/controller.py
@@ -42,7 +42,7 @@ from allura.websetup.schema import REGISTRY
#from allura.lib.custom_middleware import environ as ENV, MagicalC
from .validation import ValidatingTestApp
-DFL_APP_NAME = 'main_without_authn'
+DFL_APP_NAME = 'main'
# these are all helpers & base classes, and should never
# be considered test cases when imported into some test module
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeActivity/test.ini
----------------------------------------------------------------------
diff --git a/ForgeActivity/test.ini b/ForgeActivity/test.ini
index 1cbd5c6..b522f20 100644
--- a/ForgeActivity/test.ini
+++ b/ForgeActivity/test.ini
@@ -32,9 +32,6 @@ use = config:../Allura/test.ini
activitystream.recording.enabled = true
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeBlog/test.ini
----------------------------------------------------------------------
diff --git a/ForgeBlog/test.ini b/ForgeBlog/test.ini
index c8907df..e29c4a3 100644
--- a/ForgeBlog/test.ini
+++ b/ForgeBlog/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeChat/test.ini
----------------------------------------------------------------------
diff --git a/ForgeChat/test.ini b/ForgeChat/test.ini
index 6477871..55b5d76 100644
--- a/ForgeChat/test.ini
+++ b/ForgeChat/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeDiscussion/test.ini
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/test.ini b/ForgeDiscussion/test.ini
index 95748cc..1d2afd7 100644
--- a/ForgeDiscussion/test.ini
+++ b/ForgeDiscussion/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeGit/test.ini
----------------------------------------------------------------------
diff --git a/ForgeGit/test.ini b/ForgeGit/test.ini
index 58374c9..fa59b5b 100644
--- a/ForgeGit/test.ini
+++ b/ForgeGit/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeImporters/test.ini
----------------------------------------------------------------------
diff --git a/ForgeImporters/test.ini b/ForgeImporters/test.ini
index 019c262..0d39a4e 100644
--- a/ForgeImporters/test.ini
+++ b/ForgeImporters/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeLink/test.ini
----------------------------------------------------------------------
diff --git a/ForgeLink/test.ini b/ForgeLink/test.ini
index b3279c7..5b959b0 100644
--- a/ForgeLink/test.ini
+++ b/ForgeLink/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeSVN/test.ini
----------------------------------------------------------------------
diff --git a/ForgeSVN/test.ini b/ForgeSVN/test.ini
index 4c2e596..426aec5 100644
--- a/ForgeSVN/test.ini
+++ b/ForgeSVN/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeShortUrl/test.ini
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/test.ini b/ForgeShortUrl/test.ini
index 019c262..0d39a4e 100644
--- a/ForgeShortUrl/test.ini
+++ b/ForgeShortUrl/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeTracker/test.ini
----------------------------------------------------------------------
diff --git a/ForgeTracker/test.ini b/ForgeTracker/test.ini
index 23d52ed..0202bfd 100644
--- a/ForgeTracker/test.ini
+++ b/ForgeTracker/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeUserStats/test.ini
----------------------------------------------------------------------
diff --git a/ForgeUserStats/test.ini b/ForgeUserStats/test.ini
index 51160bb..669f24a 100644
--- a/ForgeUserStats/test.ini
+++ b/ForgeUserStats/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ddc7c5d0/ForgeWiki/test.ini
----------------------------------------------------------------------
diff --git a/ForgeWiki/test.ini b/ForgeWiki/test.ini
index 841b55e..5ee4f32 100644
--- a/ForgeWiki/test.ini
+++ b/ForgeWiki/test.ini
@@ -30,9 +30,6 @@ port = 5000
[app:main]
use = config:../Allura/test.ini
-[app:main_without_authn]
-use = config:../Allura/test.ini#main_without_authn
-
[app:main_with_amqp]
use = config:../Allura/test.ini#main_with_amqp