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 2015/04/15 16:55:06 UTC
[7/8] allura git commit: layout tidying
layout tidying
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ec969151
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ec969151
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ec969151
Branch: refs/heads/db/7870
Commit: ec969151745c042f9abb7b4805edfc362d4123d3
Parents: 8e91db7
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Apr 14 17:24:37 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Apr 15 10:54:23 2015 -0400
----------------------------------------------------------------------
Allura/development.ini | 27 +++++++---
Allura/test.ini | 127 ++++++++++++--------------------------------
2 files changed, 52 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ec969151/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 9d4df9d..69718d9 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -28,7 +28,10 @@
; More settings should be changed for good performance in a production site (no autoreload, no debugging, etc)
;
; You may copy this file to make a new configuration file (e.g. production.ini)
-; Just use the new file name instead of development.ini for any paster commands you run.
+; Or inherit from this file by starting your .ini file like this:
+; [app:main]
+; use = config:development.ini#main
+; Then just use the new file name instead of development.ini for any paster commands you run.
[DEFAULT]
; WARNING: *THE LINE BELOW MUST BE CHANGED ON A PRODUCTION ENVIRONMENT*
@@ -54,16 +57,14 @@ smtp_port = 8826
; Reply-To and From address often used in email notifications:
forgemail.return_path = noreply@localhost
-
+;
+; Settings for `paster serve` command
+;
[server:main]
use = egg:Paste#http
host = 0.0.0.0
port = 8080
-; for profiling with https://pypi.python.org/pypi/keas.profile
-[filter-app:profile]
-use=egg:keas.profile#profiler
-next=main
[app:main]
use = egg:Allura
@@ -457,20 +458,30 @@ short_url.url_pattern = {base_url}/{nbhd}/{project}/{mount_point}/{short_name}
userstats.count_lines_of_code = true
+;
+; Optional settings for profiling with https://pypi.python.org/pypi/keas.profile
+;
+[filter-app:profile]
+use=egg:keas.profile#profiler
+next=main
+
+;
; setup for the taskd background daemon request controller
+;
[app:task]
use = main
override_root = task ; TurboGears will use controllers/task.py as root controller
-
+;
; Logging configuration
+;
; Add additional loggers, handlers, formatters here
; Uses python's logging config file format
; http://docs.python.org/lib/logging-config-fileformat.html
-
+;
[loggers]
keys = root, allura, sqlalchemy, paste, pylons, taskdstatus, timermiddleware, tmw_details
http://git-wip-us.apache.org/repos/asf/allura/blob/ec969151/Allura/test.ini
----------------------------------------------------------------------
diff --git a/Allura/test.ini b/Allura/test.ini
index eb43592..a309a1d 100644
--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -1,106 +1,67 @@
-# 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 - testing configuration
-#
-#
+; 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 - testing configuration
+;
+;
;
; This inherits all the settings from development.ini
; and then overrides only settings needed for tests to work.
;
-[DEFAULT]
-
-
-;smtp_server = localhost
-
-;[server:main]
-;use = egg:Paste#http
-;host = 0.0.0.0
-;port = 5000
-
[app:main]
use = config:development.ini#main
-;full_stack = True
override_root=basetest_project_root ; TurboGears will use controllers/basetest_project_root.py as root controller
disable_template_overrides = True
-; required so that g.production_mode is True, and Google Analytics is included (weird.)
-; may also be useful for other reasons during tests (e.g. not intercepting error handling)
-debug = false
-
-# Use in-memory MongoDB
+; Use in-memory MongoDB
ming.main.uri = mim:///allura
ming.project.uri = mim:///project-data
ming.task.uri = mim:///task
-
-# ActivityStream
activitystream.master = mim://
-;activitystream.database = activitystream
-;activitystream.activity_collection = activities
-;activitystream.node_collection = nodes
-;activitystream.timeline_collection = timelines
-;activitystream.recording.enabled = true
-;activitystream.enabled = true
solr.server =
smtp.mock = true
-
load_test_data = true
cache_test_data = false
site_admin_project = test
-# useful primarily for test suites, where we want to see the error right away
+; useful primarily for test suites, where we want to see the error right away
monq.raise_errors = true
+; Required so that g.production_mode is True, and Google Analytics is included (weird.)
+; may also be useful for other reasons during tests (e.g. not intercepting error handling)
+debug = false
+
; specify these without any build_key being included
ew.script_name = /nf/_ew_/
ew.url_base = /nf/_ew_/
static.script_name = /nf/_static_/
static.url_base = /nf/_static_/
-;
scm.host.ro.git = git://git.localhost$path
scm.host.rw.git = ssh://$username@localhost:8022/scm-repo$path
-;scm.host.https.git = https://$username@localhost:8022/scm-repo$path
-;scm.host.https_anon.git = https://localhost:8022/scm-repo$path
-;scm.host.ro.hg = http://hg.localhost$path
-;scm.host.rw.hg = ssh://$username@localhost:8022/scm-repo$path
-;scm.host.https.hg = https://$username@localhost:8022/scm-repo$path
-;scm.host.https_anon.hg = https://localhost:8022/scm-repo$path
-;scm.host.ro.svn = http://svn.localhost$path/
-;scm.host.rw.svn = svn+ssh://$username@localhost:8022/scm-repo$path/
-;scm.host.https.svn = https://$username@localhost:8022/scm-repo$path/
-;scm.host.https_anon.svn = https://localhost:8022/scm-repo$path/
-;
-;scm.clone.git = git clone $source_url $dest_path
-;scm.clone.hg = hg clone $source_url $dest_path
-;scm.clone.https_anon.svn = svn checkout $source_url $dest_path
-;scm.clone.ro.svn = svn checkout $source_url $dest_path
-;scm.clone.svn = svn checkout --username=$username $source_url $dest_path
-;
+
scm.repos.root = /tmp
scm.repos.tarball.enable = true
scm.repos.tarball.root = /tmp/tarball
scm.repos.tarball.url_prefix = file://
-;
-;bulk_export_path = /tmp/bulk_export/{nbhd}/{project}
; TODO: make this and tests match development.ini
bulk_export_filename = {project}.zip
@@ -108,45 +69,23 @@ bulk_export_filename = {project}.zip
; TODO: update tests and let this be true
solr.use_new_types = false
-;support_tool_choices = wiki tickets discussion
-
-# markdown text longer than max length will not be converted to html
-# tests expect max length of 40000
-markdown_render_max_length = 40000
-
-;user_message.max_messages = 200
-
; TODO: update tests and remove this setting override
auth.require_email_addr = false
+; markdown text longer than max length will not be converted to html
+; tests expect max length of 40000
+markdown_render_max_length = 40000
+
; if enabled during tests, TimerMiddleware will end up wrapping requests way too many times instead of just once
; not necessary anyway
stats.sample_rate = 0
-# LDAP auth provider
-;auth.ldap.server = ldaps://localhost/
-;auth.ldap.suffix = ou=users,dc=sf,dc=net
-;auth.ldap.admin_dn = cn=site,ou=admin,dc=sf,dc=net
-;auth.ldap.admin_password = admin-password
-;auth.ldap.use_schroot = False
-;auth.ldap.password.algorithm = 6
-;auth.ldap.password.rounds = 6000
-;auth.ldap.password.salt_len = 16
-;user_prefs_storage.ldap.fields.display_name = cn
;
-;auth.allow_user_to_disable_account = true
-;auth.allow_edit_prefs = true
-
-
-
-# Add additional test specific configuration options as necessary.
+; Logging goes to a test.log file in current directory
+;
[loggers]
keys = root, allura
-; TODO: ./run_tests will capture ming.mim DEBUG output
-; but running a test individually ok
-
-; TODO: forgeblog.tests.test_commands:test_plaintext_preprocessor_wrapped fails with slight difference in output
[handlers]
keys = test