aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-03-06 13:00:03 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:03 +0200
commit1b4bdff3b3d01cd422f7a49a1de14b3edbd76804 (patch)
treea7bf65f10478f5e0d5e43acbbb8968b565b825cb /tests
parent89d87a99db403d7045406b869a92258e61122f67 (diff)
downloadforums-1b4bdff3b3d01cd422f7a49a1de14b3edbd76804.tar
forums-1b4bdff3b3d01cd422f7a49a1de14b3edbd76804.tar.gz
forums-1b4bdff3b3d01cd422f7a49a1de14b3edbd76804.tar.bz2
forums-1b4bdff3b3d01cd422f7a49a1de14b3edbd76804.tar.xz
forums-1b4bdff3b3d01cd422f7a49a1de14b3edbd76804.zip
[ticket/11768] Fixed test double
PHPBB3-11768
Diffstat (limited to 'tests')
-rw-r--r--tests/text_processing/message_parser_test.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php
index cdbd6c0ca7..691c0d5b8a 100644
--- a/tests/text_processing/message_parser_test.php
+++ b/tests/text_processing/message_parser_test.php
@@ -53,6 +53,7 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case
array('UNAUTHORISED_BBCODE', '[img]', 'You cannot use certain BBCodes: [img].'),
array('UNAUTHORISED_BBCODE', '[quote]', 'You cannot use certain BBCodes: [quote].'),
array('UNAUTHORISED_BBCODE', '[url]', 'You cannot use certain BBCodes: [url].'),
+ array('UNABLE_GET_IMAGE_SIZE', 'It was not possible to determine the dimensions of the image.'),
);
$user = $this->getMockBuilder('phpbb\\user')->disableOriginalConstructor()->getMock();
@@ -67,7 +68,6 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case
'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.',
'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.',
'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.',
- 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.'
);
$phpbb_container = new phpbb_mock_container_builder;
tar.xz
drakx-49924b81a16c0f357c1957d5e638262db2f4e7d0.zip
require resize_fat::main when needed (fix bug #5204)
Diffstat
-rw-r--r--perl-install/diskdrake/hd_gtk.pm1
-rw-r--r--perl-install/diskdrake/interactive.pm1
2 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index a2316a050..5342b939b 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -4,7 +4,6 @@ use diagnostics;
use strict;
use common;
-use resize_fat::main;
use ugtk2 qw(:helpers :wrappers :create);
use partition_table qw(:types);
use partition_table::raw;
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 410391a13..3cf8d1f14 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -650,6 +650,7 @@ sub Resize {
#- try to resize without losing data
my $_w = $in->wait_message(N("Resizing"), N("Computing FAT filesystem bounds"));
+ require resize_fat::main;
$nice_resize{fat} = resize_fat::main->new($part->{device}, devices::make($part->{device}));
$min = max($min, $nice_resize{fat}->min_size);
$max = min($max, $nice_resize{fat}->max_size);