Skip to content

Commit

Permalink
[#249 state:resolved] Here are the results:
Browse files Browse the repository at this point in the history
new-host-3:melody mike$ prove -w t/97-impexp.t
Name "main::running_under_some_shell" used only once: possible typo at /usr/bin/prove5.10.0 line 3.
t/97-impexp.t .. Name "DBD::SQLite::sqlite_version" used only once: possible typo at /System/Library/Perl/5.10.0/darwin-thread-multi-2level/DynaLoader.pm line 230.
t/97-impexp.t .. ok
All tests successful.
Files=1, Tests=6,  6 wallclock secs ( 0.04 usr  0.01 sys +  4.90 cusr  0.37 csys =  5.32 CPU)
Result: PASS

I do not get the DBD::SQLite warning on Linux.
  • Loading branch information
Mike committed Sep 23, 2010
1 parent 6557ca1 commit af863d2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/MT/ImportExport.pm
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ sub import_contents {
my $allow_comments = $blog->allow_comments_default;
my $allow_pings = $blog->allow_pings_default ? 1 : 0;
my $convert_breaks = $param{ConvertBreaks};
$convert_breaks = $blog->convert_paras if $convert_breaks == -1;
$convert_breaks = $blog->convert_paras unless $convert_breaks; #if $convert_breaks eq -1;
my $def_status = $param{default_status} || $blog->status_default;
my(%authors, %categories);

Expand Down
2 changes: 1 addition & 1 deletion t/97-impexp.t
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ $param{'Blog'} = $blog;
$param{'Callback'} = 1;
$param{'ParentAuthor'} = $user;
$param{'NewAuthorPassword'} = 'PASSWORD';
$param{'ConvertBreaks'} = '';
$param{'ConvertBreaks'} = $blog->convert_paras;
$param{'Callback'} = sub { my ($string) = @_; print " $string\n"; 1};
my $result = $ie->import_contents(%param);

Expand Down
6 changes: 3 additions & 3 deletions t/lib/MT/Test.pm
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ sub init_app {
};
*MT::App::login = sub {
my $app = shift;
if ( my $user = $app->param('__test_user') ) {
if ( my $user = $app->query->param('__test_user') ) {

# attempting to fake user session
if ( !$session_id
|| $user->name ne $session_username
|| $app->param('__test_new_session') )
|| $app->query->param('__test_new_session') )
{
$app->start_session( $user, 1 );
$session_id = $app->{session}->id;
Expand All @@ -144,7 +144,7 @@ sub init_app {
else {
$app->session_user( $user, $session_id );
}
$app->param( 'magic_token', $session_id );
$app->query->param( 'magic_token', $session_id );
$app->user($user);
return ( $user, 0 );
}
Expand Down

0 comments on commit af863d2

Please sign in to comment.