Merge into 7.0 : bug666548-test-fixes : Code : Drizzle

Status:

Merged

Approved by:

Patrick Crews on 2010-11-03

Approved revision:

1886

Merged at revision:

1903

Proposed branch:

lp://qastaging/~patrick-crews/drizzle/bug666548-test-fixes

Merge into:

lp://qastaging/drizzle/7.0

Diff against target:

791 lines (+216/-146)

22 files modified

plugin/innobase/tests/r/loaddata_autocom_innodb.result (+2/-2)
plugin/transaction_log/tests/r/transaction_log_loaddata.result (+1/-1)
plugin/transaction_log/tests/t/transaction_log_loaddata.test (+2/-1)
tests/include/loaddata_autocom.inc (+4/-2)
tests/r/func_str.result (+2/-2)
tests/r/loaddata.result (+14/-14)
tests/r/null.result (+1/-1)
tests/r/outfile.result (+7/-9)
tests/r/subselect3.result (+2/-2)
tests/r/warnings.result (+1/-1)
tests/suite/jp/r/like_utf8.result (+12/-12)
tests/suite/jp/r/select_utf8.result (+12/-12)
tests/suite/jp/r/where_utf8.result (+12/-12)
tests/suite/jp/t/like_utf8.test (+21/-12)
tests/suite/jp/t/select_utf8.test (+21/-12)
tests/suite/jp/t/where_utf8.test (+21/-12)
tests/t/func_str.test (+6/-2)
tests/t/loaddata.test (+28/-14)
tests/t/null.test (+2/-1)
tests/t/outfile.test (+39/-19)
tests/t/subselect3.test (+4/-2)
tests/t/warnings.test (+2/-1)

To merge this branch:

bzr merge lp://qastaging/~patrick-crews/drizzle/bug666548-test-fixes

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Drizzle Developers		2010-10-26	Pending
Review via email: mp+39334@code.qastaging.launchpad.net

Description of the change

Updates test that were using INFILE stuff to make use of $DRIZZLETEST_VARDIR rather than a hard-coded path to the standard location.

Updated all tests in all suites and we can now run everything with the --mem option.

Revision history for this message

Lee Bieber (kalebral-deactivatedaccount) wrote on 2010-10-26:

#

Getting test failure on several platforms:

main.outfile [ fail ]
--- ../../tests/r/outfile.result 2010-10-26 08:14:28.000000000 +0300
+++ /home/hudson/hudson/workspace/drizzle-build-ubuntu10.04-64bit-2/drizzle7-2010.10.1882/_build/tests/var/log/outfile.reject 2010-10-26 08:28:35.366218806 +0300
@@ -17,7 +17,7 @@
ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.2' already exists
ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.3' already exists
select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
-ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exist' must be in the schema directory or be readable by all
+ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exis' must be in the schema directory or be readable by all
drop table t1;
select load_file(concat(@tmpdir,"/outfile-test.4"));
load_file(concat(@tmpdir,"/outfile-test.4"))

drizzletest: Result content mismatch

http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-debian-testing-64bit/642/console
http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-32bit-2/758/console
http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-64bit-2/805/console

Revision history for this message

Patrick Crews (patrick-crews) wrote on 2010-10-26:

#

I'll take a look at this, but I suspect the error message is being truncated
due to the length of the path to the vardir:

/home/hudson/hudson/workspace/drizzle-build-ubuntu10.04-64bit-2/drizzle7-2010.10.1882/_build/tests/var/

The message / file name is not truncated within the test and runs ok with a
shorter path to the branch under test - will see if there is anything I can
do to tweak this

On Tue, Oct 26, 2010 at 9:26 AM, Lee Bieber <email address hidden> wrote:

> Getting test failure on several platforms:
>
> main.outfile [ fail ]
> --- ../../tests/r/outfile.result 2010-10-26 08:14:28.000000000 +0300
> +++
> /home/hudson/hudson/workspace/drizzle-build-ubuntu10.04-64bit-2/drizzle7-2010.10.1882/_build/tests/var/log/outfile.reject
> 2010-10-26 08:28:35.366218806 +0300
> @@ -17,7 +17,7 @@
> ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.2' already exists
> ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.3' already exists
> select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
> -ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exist' must
> be in the schema directory or be readable by all
> +ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exis' must
> be in the schema directory or be readable by all
> drop table t1;
> select load_file(concat(@tmpdir,"/outfile-test.4"));
> load_file(concat(@tmpdir,"/outfile-test.4"))
>
> drizzletest: Result content mismatch
>
>
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-debian-testing-64bit/642/console
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-32bit-2/758/console
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-64bit-2/805/console
>
>
>
>
> --
>
> https://code.launchpad.net/~patrick-crews/drizzle/bug666548-test-fixes/+merge/39334<https://code.launchpad.net/%7Epatrick-crews/drizzle/bug666548-test-fixes/+merge/39334>
> You are the owner of lp:~patrick-crews/drizzle/bug666548-test-fixes.
>

I'll take a look at this, but I suspect the error message is being truncated
due to the length of the path to the vardir:

/home/hudson/hudson/workspace/drizzle-build-ubuntu10.04-64bit-2/drizzle7-2010.10.1882/_build/tests/var/

The message / file name is not truncated within the test and runs ok with a
shorter path to the branch under test - will see if there is anything I can
do to tweak this

On Tue, Oct 26, 2010 at 9:26 AM, Lee Bieber <kalebral@gmail.com> wrote:

> Getting test failure on several platforms:
>
> main.outfile                                                 [ fail ]
> --- ../../tests/r/outfile.result        2010-10-26 08:14:28.000000000 +0300
> +++
> /home/hudson/hudson/workspace/drizzle-build-ubuntu10.04-64bit-2/drizzle7-2010.10.1882/_build/tests/var/log/outfile.reject
>   2010-10-26 08:28:35.366218806 +0300
> @@ -17,7 +17,7 @@
>  ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.2' already exists
>  ERROR HY000: File 'DRIZZLETEST_VARDIR/tmp/outfile-test.3' already exists
>  select load_file(concat(@tmpdir,"/outfile-test.not-exist"));
> -ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exist' must
> be in the schema directory or be readable by all
> +ERROR HY000: The file 'DRIZZLETEST_VARDIR/tmp/outfile-test.not-exis' must
> be in the schema directory or be readable by all
>  drop table t1;
>  select load_file(concat(@tmpdir,"/outfile-test.4"));
>  load_file(concat(@tmpdir,"/outfile-test.4"))
>
> drizzletest: Result content mismatch
>
>
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-debian-testing-64bit/642/console
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-32bit-2/758/console
>
> http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-ubuntu10.04-64bit-2/805/console
>
>
>
>
> --
>
> https://code.launchpad.net/~patrick-crews/drizzle/bug666548-test-fixes/+merge/39334<https://code.launchpad.net/%7Epatrick-crews/drizzle/bug666548-test-fixes/+merge/39334>
> You are the owner of lp:~patrick-crews/drizzle/bug666548-test-fixes.
>

Revision history for this message

Patrick Crews (patrick-crews) wrote on 2010-11-03:

#

I have updated the tests so that we don't hit the issues with error message truncation (via creative use of SUBSTRING and information provided by Dave).

Passed in param-build without issues now.

We should be able to use --mem to run our tests all the time now as well.

Drizzle

Merge lp://qastaging/~patrick-crews/drizzle/bug666548-test-fixes into lp://qastaging/drizzle/7.0

Commit message

Description of the change

Preview Diff

Subscribers