[Rt-commit] rt branch, new-webmux, updated. rt-3.8.6-101-g593a949
Ruslan Zakirov
ruz at bestpractical.com
Fri Nov 20 06:24:05 EST 2009
The branch, new-webmux has been updated
via 593a9495d5385e9a42eb21ce61cb19b75033d72c (commit)
via c0bc0f65b5cf80e5d2a12afef3f1261198864b06 (commit)
via 91f0f31fbe56e2380e845074c9701b2c214af516 (commit)
via 8d00d3a4c3a9c133a93e19d53856c5d87b7b5c43 (commit)
via 68425c35ff842f8ef0d31d5db8480f42012747c8 (commit)
via 06bb6f547b1c7c804b6e8f09482ad6af6e402887 (commit)
via 06aa3d20454ace068a65661d11681187fa484354 (commit)
via 054c5f3bb927914c91a167b8f749ef5a69937673 (commit)
via e221be4bb8168d36c6cf40f83f3d02d9d738273a (commit)
via 59000984a6f50c1290a81d116c38a0a87534eae0 (commit)
via 28454656545278bc38aabe3b2b63fc64f4541152 (commit)
via dfcb998dbb52b890bc55d3b6112ffe080a7e818e (commit)
via cf02ac1c1509cd06c7bb3045dd905a58fc581e93 (commit)
via 882da8defc632e57ee56989c22fd4616c6aac812 (commit)
via dfcdec9aa8416d1e1e12bdeb9c95de76a2563954 (commit)
via 9265075b4a4721ff85b71fb58147e65ece92d90d (commit)
via 92a31983f4118638f3d93613b73a2e8308381de6 (commit)
via 17f46e8a81158500003451964240670d819e5e54 (commit)
via d3e08429723d85804365820f08e00d26173f08bf (commit)
via 7c7494de7508343948e750db6210f7fb12bca9d8 (commit)
via 177b396f8889db717a972e1fe5c42e4b4573eed9 (commit)
via cb9b2716a21a92f288f62548386a4ed2dbcb1e6f (commit)
via faa431530cb245fa2b9dfc6f2f31480b2550aaae (commit)
via 0181edeef105bb8ca53002375368222c86962521 (commit)
via 7cb0d2226c4f47180371b5f9c9544f1bd3252afd (commit)
via 835ca9e393799c47bac9be284e5c8bdd045ed3aa (commit)
via 55f5e824dcb06e344a8ae7535f14c973639a0bea (commit)
via 8cac533616e5e9fda3349207f8b08343d21837d8 (commit)
via 0703e80114f6e64c85dc89df29779c34f6752ae1 (commit)
via fb984b624e4f3d2d301e88bad38c1ef6180c18db (commit)
via c81489178f7b58bd15ec6e3a4cc182574233c18b (commit)
via d17c5d0a96ce3a497bde93addcbb879925a1fd6f (commit)
via 9307bb81790b903615d106226f3b1f71358c0945 (commit)
via 84022062cec889f1cabf1d4a10e28b7b66addf23 (commit)
via 30e610f1d916bbd3d91e24380a7406deea6bd595 (commit)
via f1eb6a3433e9cab95a8737b3976e0900028407ad (commit)
via 4eb846f4b7da66940f6bc479a0367d226969e99d (commit)
via c325f902cb9ff174b15b73d5809bce55b42fc764 (commit)
via 7b4d378f4861c66e2e3c834c1649dcfb7a174e61 (commit)
via 4623dff516ef04d1d7530d5ae618871360f19001 (commit)
via 0f7aba944e10231fc320a3ada3d1c3d59f79316a (commit)
via 066464c1eec2e5231173b75e26c2c7ce42e1d1c5 (commit)
via 93345dec507c2fd3d529c0b008793df18d6b3b8d (commit)
via 18796b3e76e740f8dda27efd4d181bed4faa9ef1 (commit)
via d71fab11096ab703d966eda863e03ea4d56b379b (commit)
via 86bfda78d2d9442e94f73e67789a77cbef41d5af (commit)
via 48f5c2a31f889e7baf2d4f38555a73dc620a9a3a (commit)
via 101490ac3f41069092318df77f48b2fb3df0d6b1 (commit)
via a7c75aeff4f684a06ff12e29113536bdee2cbe34 (commit)
via 0df8fb6894d3dfc1cb3d07543ce87f8881df25b2 (commit)
via 76d907a69859ad04c172f82acf10e92dc614578f (commit)
via 15afb7b20affec5cd0ad59477406c94fefa854d6 (commit)
via 2643a97bfa546899db7f8976d33c78f5cfe3649b (commit)
via fc5851034f891f9302fc82a0ce735f8bb7d16828 (commit)
via 831d0a518146be36b4a331fee69bad364c054c70 (commit)
via 583d32f4848be36dd90ad3e817fddb99f730565a (commit)
via 79ac4f8c3f729dbe5a8a8e4826836425802878e6 (commit)
via ce5f1e7b2d8a86ba9dbe08bd2672d6c113102a48 (commit)
via e8c391f7a4119cee3176956fe3d2f7f11599b874 (commit)
via e1a7593cca1c5662ad4dbe052323d5054d00f9ac (commit)
via f79f002f5678de9ef998aeb2bc247317c1583f1b (commit)
via d58e655c8d39bddef64c68f8c4154b9018cc12e1 (commit)
via 10dbd767bb098cd4ff0b9ab55151f8e82137db44 (commit)
via 8ec9c13c06758f77b38e86edb1c8f3f9ab24907c (commit)
via 1a8fd23ee6c068f9d7f949ada4c28be31e1b8dfe (commit)
via b58cd4fe84a350a56c1808d5181a46ea48390d5d (commit)
via ff2224d68054e3e0e1d5383992a7b3dc8094c5bb (commit)
via 3d974f472ede8eee5b5225204d6b0bd9fc28c073 (commit)
via 8875af6ef0f78d1ac983506f340c1e218758f498 (commit)
via bdebe4a4a5a479fe0afd805c14857a7d120c6913 (commit)
via 5aff830963de0f92b117cae79b3714c50a428b5c (commit)
via c355c7e57b4c79daacc3dde25f0490d6ba3bdad3 (commit)
via 9f1f17b61421d643f477232149fab33fb456c2c0 (commit)
via e05230b35cc4ef99e5f869d1b14a1ecccc7acb5f (commit)
via e150432be7c5a6bd7b6bad8820f773b4e6e0d6e4 (commit)
via 37683bce2e2b5e5d72a68f5cc6767435556958e5 (commit)
via 60491e9698361f7d74129ced60edcefc3b1ab57a (commit)
via 22e95676e0467cd0f0b48a98f362d41b9723b9c9 (commit)
via 170d9facaabcaa1f5feeac5aa213b54445f86225 (commit)
via f9619d3b0def137adff3d63dfec33b2eb727e189 (commit)
via 6c516bb34adcbff0d8b63598c488db444f899fcc (commit)
via 6aeaa1033d2ba1034bcbb908734825fe0a15a36f (commit)
via fb5ed4f20b1963699fa9ce5c8d5caa11ffcc10d0 (commit)
via e5e0bbec968445a9f4297f274a0b6d4149847784 (commit)
via ee3731ffdcc5cdbdd4027ae8821888112f4ba4a0 (commit)
via 0c6959ab9ad12d4dcd2fc53960ab1c40d6bdc18d (commit)
via 2e3048aa48803009e845a2b81d2132b425e37b7f (commit)
via 0ae31e21e7e2743dade881de22e0917f7d3d64ed (commit)
via c213a434691610808a31702e13d4eb0d1e6f4dc6 (commit)
via 68ff8b6dcf1c93df1488d791eeb05d588f2b175e (commit)
via e59e81974bfe584db371e166f0f59e5949bb40c2 (commit)
via 9803f6b7e7a75c188177d876a69ddda68ce14c7b (commit)
via ec0256fdb2554218667f7e6243eb926244a20bf5 (commit)
via 94637640afa1ebf8288b5a4e608d64637c56666f (commit)
via d343e18de308e6d3de4856d623450a3000758ac8 (commit)
via 7b3d05fdc3977e7536b5dd71728af07ebc1c9447 (commit)
via 9982496c0ca2cc46265b5eb894fc28edcbed3666 (commit)
via d8d0f822fbec2b66481de983dbade6ebced7d8c5 (commit)
via 99e477aab130bd478e5a7efb23900be41375f981 (commit)
via 3318b3103d3e52633a02e67849195038c43a3cfd (commit)
via 71032278ebb1b2b010ac13bec9a095a8358cc73e (commit)
via 361130e9b25f904cd38e470fa3d9c8222427d521 (commit)
via 8139f0b974cf17305f1f0b88b1791a67f8196893 (commit)
via 916a5a542ffe73dca8e4c1ac1a98cafc5250cc10 (commit)
via 7429f555227fccb6488e87891fa7581a842f5cf0 (commit)
via 925fc4ca2d9eb75f91b0955fd7a65088febf07f3 (commit)
via 771eadff7930e642b8415b207b0085099ea4b0e1 (commit)
via 55289bb0304f1dca06d1b179a3c3ede6565c5eb2 (commit)
from 215446ad5be978d2c567c8e411e7e92240d4c43c (commit)
Summary of changes:
.gitignore | 1 +
UPGRADING | 6 +
UPGRADING.mysql | 6 +-
aclocal.m4 | 1 +
config.layout | 7 +
configure.ac | 3 +
etc/RT_Config.pm.in | 41 +++
etc/acl.Pg | 6 +-
lib/RT.pm.in | 15 +-
lib/RT/Action/CreateTickets.pm | 2 -
lib/RT/CustomField_Overlay.pm | 12 -
lib/RT/Date.pm | 33 ++-
lib/RT/I18N/fr.po | 2 +-
lib/RT/I18N/nb.po | 2 +-
lib/RT/Interface/Email.pm | 47 +++-
lib/RT/Interface/Web.pm | 36 ++-
lib/RT/Plugin.pm | 4 +-
lib/RT/Queue_Overlay.pm | 6 +-
lib/RT/Record.pm | 1 +
lib/RT/SQL.pm | 26 ++-
lib/RT/Shredder/Plugin/Objects.pm | 2 +-
lib/RT/Test.pm | 298 ++++++++++++++------
lib/RT/Test/Web.pm | 2 +-
lib/RT/User_Overlay.pm | 2 +-
m4/rt_layout.m4 | 5 +-
sbin/rt-email-dashboards.in | 4 +-
sbin/rt-test-dependencies.in | 2 +-
share/html/Admin/Elements/ToolTabs | 2 +-
share/html/Dashboards/Elements/ShowPortlet/search | 2 +-
share/html/Dashboards/Queries.html | 4 +-
share/html/Dashboards/index.html | 28 ++-
share/html/Elements/DashboardTabs | 13 +-
share/html/Elements/EditCustomFieldAutocomplete | 4 +-
share/html/Elements/EditCustomFieldSelect | 29 ++-
share/html/Elements/ShowSearch | 6 +-
share/html/NoAuth/css/web2/ticket.css | 1 +
share/html/REST/1.0/Forms/ticket/default | 5 +-
share/html/Search/Build.html | 11 +-
share/html/Search/Bulk.html | 9 +-
share/html/Search/Chart.html | 10 +-
share/html/Search/Edit.html | 4 +-
share/html/Search/Elements/Chart | 2 +
share/html/Search/Elements/EditSearches | 31 ++-
share/html/Search/Results.html | 7 +-
share/html/SelfService/Elements/MyRequests | 7 +-
share/html/Ticket/Create.html | 109 ++++----
share/html/Ticket/Elements/BulkLinks | 118 ++++++++
share/html/Ticket/Elements/FindAttachments | 2 +-
share/html/Ticket/Elements/ShowMessageStanza | 2 +-
.../Ticket/Elements/ShowTransactionAttachments | 3 +-
share/html/Ticket/Elements/Tabs | 3 +-
share/html/Ticket/Update.html | 22 +-
share/html/Tools/Offline.html | 5 +-
share/html/Widgets/SavedSearch | 42 +++-
share/html/Widgets/SelectionBox | 5 +-
t/api/date.t | 7 +-
t/data/configs/apache2.2+fastcgi.conf.in | 4 +-
t/data/configs/apache2.2+mod_perl.conf.in | 1 +
t/mail/gateway.t | 2 +-
t/maildigest/attributes.t | 2 +
t/web/basic.t | 162 +++++------
t/web/command_line_with_unknown_field.t | 34 +++
t/web/dashboard_with_deleted_saved_search.t | 89 ++++++
t/web/dashboards-permissions.t | 38 +++
t/web/offline_messages_utf8.t | 67 +++++
t/web/offline_utf8.t | 54 ++++
t/web/rest-non-ascii-subject.t | 6 +-
t/web/saved_search_chart.t | 86 ++++++
t/web/saved_search_permissions.t | 34 +++
t/web/search_bulk_update_links.t | 147 ++++++++++
t/web/ticket_update_without_content.t | 52 ++++
71 files changed, 1437 insertions(+), 406 deletions(-)
create mode 100644 t/web/command_line_with_unknown_field.t
create mode 100644 t/web/dashboard_with_deleted_saved_search.t
create mode 100644 t/web/dashboards-permissions.t
create mode 100644 t/web/offline_messages_utf8.t
create mode 100644 t/web/offline_utf8.t
create mode 100644 t/web/saved_search_chart.t
create mode 100644 t/web/saved_search_permissions.t
create mode 100644 t/web/search_bulk_update_links.t
create mode 100644 t/web/ticket_update_without_content.t
- Log -----------------------------------------------------------------
commit 8d00d3a4c3a9c133a93e19d53856c5d87b7b5c43
Merge: 215446a 68425c3
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Nov 20 13:42:57 2009 +0300
Merge branch '3.8-trunk' into new-webmux
diff --cc lib/RT/Test.pm
index d09bfc2,34e5fae..301785e
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@@ -955,13 -1058,18 +1058,18 @@@ sub start_apache_server
my $method = 'apache_'.$variant.'_server_options';
$self->$method( \%info, \%opt );
}
- my ($conf_fh, $conf_fn) = $self->process_in_file(
- in => $tmpl, options => \%opt, out => $tmpl .'.final',
+ $tmp{'config'}{'apache'} = File::Spec->catfile(
+ "$tmp{'directory'}", "apache.conf"
+ );
+ $self->process_in_file(
+ in => $tmpl,
+ out => $tmp{'config'}{'apache'},
+ options => \%opt,
);
- $self->fork_exec($info{'executable'}, '-f', $conf_fn);
+ $self->fork_exec($info{'executable'}, '-f', $tmp{'config'}{'apache'});
my $pid = do {
- my $tries = 60;
+ my $tries = 10;
while ( !-e $pid_fn ) {
$tries--;
last unless $tries;
commit 91f0f31fbe56e2380e845074c9701b2c214af516
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Nov 20 14:17:04 2009 +0300
generate LockFile option for apache as well
It's all crazy, defaults can be absolute and not relative to
the root.
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 301785e..71abe63 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1034,26 +1034,24 @@ sub start_apache_server {
<$fh>
});
- my $log_fn = File::Spec->catfile(
- "$tmp{'directory'}", 'apache.log'
- );
- my $pid_fn = File::Spec->catfile(
- "$tmp{'directory'}", "apache.pid"
- );
my $tmpl = File::Spec->rel2abs( File::Spec->catfile(
't', 'data', 'configs',
'apache'. $info{'version'} .'+'. $variant .'.conf'
) );
my %opt = (
- listen => $port,
- server_root => $info{'HTTPD_ROOT'} || $ENV{'HTTPD_ROOT'}
+ listen => $port,
+ server_root => $info{'HTTPD_ROOT'} || $ENV{'HTTPD_ROOT'}
|| Test::More::BAIL_OUT("Couldn't figure out server root"),
- pid_file => $pid_fn,
- document_root => $RT::MasonComponentRoot,
- rt_bin_path => $RT::BinPath,
- log_file => $log_fn,
+ document_root => $RT::MasonComponentRoot,
+ tmp_dir => "$tmp{'directory'}",
+ rt_bin_path => $RT::BinPath,
rt_site_config => $ENV{'RT_SITE_CONFIG'},
);
+ foreach (qw(log pid lock)) {
+ $opt{$_ .'_file'} = File::Spec->catfile(
+ "$tmp{'directory'}", "apache.$_"
+ );
+ }
{
my $method = 'apache_'.$variant.'_server_options';
$self->$method( \%info, \%opt );
@@ -1070,14 +1068,14 @@ sub start_apache_server {
$self->fork_exec($info{'executable'}, '-f', $tmp{'config'}{'apache'});
my $pid = do {
my $tries = 10;
- while ( !-e $pid_fn ) {
+ while ( !-e $opt{'pid_file'} ) {
$tries--;
last unless $tries;
sleep 1;
}
Test::More::BAIL_OUT("Couldn't start apache server, no pid file")
- unless -e $pid_fn;
- open my $pid_fh, '<', $pid_fn
+ unless -e $opt{'pid_file'};
+ open my $pid_fh, '<', $opt{'pid_file'}
or Test::More::BAIL_OUT("Couldn't open pid file: $!");
my $pid = <$pid_fh>;
chomp $pid;
commit c0bc0f65b5cf80e5d2a12afef3f1261198864b06
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Nov 20 14:20:36 2009 +0300
don't delete tmp when we bail out
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 71abe63..5615324 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1267,11 +1267,11 @@ END {
RT::Test->stop_server;
# not success
- if ( grep !$_, $Test->summary ) {
+ if ( !$Test->summary || grep !$_, $Test->summary ) {
$tmp{'directory'}->unlink_on_destroy(0);
Test::More::diag(
- "Some tests failed, tmp directory"
+ "Some tests failed or we bailed out, tmp directory"
." '$tmp{directory}' is not cleaned"
);
}
commit 593a9495d5385e9a42eb21ce61cb19b75033d72c
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Nov 20 14:21:19 2009 +0300
set LockFile and don't set TypesConfig
diff --git a/t/data/configs/apache2.2+fastcgi.conf.in b/t/data/configs/apache2.2+fastcgi.conf.in
index c0c01d1..75cbadb 100644
--- a/t/data/configs/apache2.2+fastcgi.conf.in
+++ b/t/data/configs/apache2.2+fastcgi.conf.in
@@ -1,11 +1,11 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root at localhost
%%LOAD_MODULES%%
-TypesConfig /etc/mime.types
-FastCgiIpcDir /tmp
+FastCgiIpcDir %%TMP_DIR%%
<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
diff --git a/t/data/configs/apache2.2+mod_perl.conf.in b/t/data/configs/apache2.2+mod_perl.conf.in
index ed12c86..3d28c2c 100644
--- a/t/data/configs/apache2.2+mod_perl.conf.in
+++ b/t/data/configs/apache2.2+mod_perl.conf.in
@@ -1,5 +1,6 @@
ServerRoot %%SERVER_ROOT%%
PidFile %%PID_FILE%%
+LockFile %%LOCK_FILE%%
ServerAdmin root at localhost
%%LOAD_MODULES%%
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list