diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-05-23 05:19:49 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-05-23 05:19:49 +0200 |
| commit | b839716142789f33ed539a8438e6000a359f8751 (patch) | |
| tree | c10d32ebd43d77687a33c4926d988ff11787efa0 | |
| parent | 00807eb9887fac9ec662e832705e887c6bada780 (diff) | |
| parent | 6e53f77df7e055797ef587f349e3c35fdd82718c (diff) | |
| download | bugzilla-b839716142789f33ed539a8438e6000a359f8751.tar.gz bugzilla-b839716142789f33ed539a8438e6000a359f8751.tar.xz | |
merged with bugzilla/4.2
| -rw-r--r-- | Bugzilla/Constants.pm | 2 | ||||
| -rw-r--r-- | docs/en/xml/Bugzilla-Guide.xml | 4 | ||||
| -rw-r--r-- | xt/lib/Bugzilla/Test/Search/Constants.pm | 25 |
3 files changed, 26 insertions, 5 deletions
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index a30b987af..8385dc869 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -205,7 +205,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.2.5+"; +use constant BUGZILLA_VERSION => "4.2.6+"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml index d2461eda1..045a426ee 100644 --- a/docs/en/xml/Bugzilla-Guide.xml +++ b/docs/en/xml/Bugzilla-Guide.xml @@ -32,9 +32,9 @@ For a devel release, simple bump bz-ver and bz-date --> -<!ENTITY bz-ver "4.2.5"> +<!ENTITY bz-ver "4.2.6"> <!ENTITY bz-nextver "4.4"> -<!ENTITY bz-date "2013-02-19"> +<!ENTITY bz-date "2013-05-22"> <!ENTITY current-year "2013"> <!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-4.2-branch/"> diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm index 051570ff8..85547df46 100644 --- a/xt/lib/Bugzilla/Test/Search/Constants.pm +++ b/xt/lib/Bugzilla/Test/Search/Constants.pm @@ -263,6 +263,15 @@ use constant KNOWN_BROKEN => { 'allwords-<1>' => { ALLWORDS_BROKEN, }, + 'anywords-<1>' => { + 'flagtypes.name' => { contains => [1,2,3,4,5] }, + }, + 'anywords-<1> <2>' => { + 'flagtypes.name' => { contains => [3,4,5] }, + }, + 'anywordssubstr-<1> <2>' => { + 'flagtypes.name' => { contains => [3,4,5] }, + }, # setters.login_name and requestees.login name aren't tracked individually # in bugs_activity, so can't be searched using this method. @@ -401,12 +410,18 @@ use constant BROKEN_NOT => { anyexact => { 'flagtypes.name' => { contains => [1, 2, 5] }, }, - anywords => { - 'flagtypes.name' => { contains => [1, 2, 5] }, + 'anywords-<1>' => { + 'flagtypes.name' => { contains => [1, 2, 3, 4, 5] }, + }, + 'anywords-<1> <2>' => { + 'flagtypes.name' => { contains => [3, 4, 5] }, }, anywordssubstr => { 'flagtypes.name' => { contains => [5] }, }, + 'anywordssubstr-<1> <2>' => { + 'flagtypes.name' => { contains => [3,4,5] }, + }, casesubstring => { 'flagtypes.name' => { contains => [5] }, }, @@ -462,6 +477,12 @@ use constant BROKEN_NOT => { notsubstring => { longdesc => { contains => [1] }, }, + 'nowords-<1>' => { + 'flagtypes.name' => { contains => [5] }, + }, + 'nowordssubstr-<1>' => { + 'flagtypes.name' => { contains => [5] }, + }, lessthan => { 'flagtypes.name' => { contains => [5] }, }, |