Merge lp:~zorba-coders/zorba/fix_bug_dc into lp:zorba/data-cleaning-module

[Sorin Marian Nasoi]

Fix for bug 871051.

Fix for bug 871051.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Gabriel Petrovay (gabipetrovay)]

This doesn't fix the issue:
The following tests FAILED:
        2516 - zorba_data-cleaning_module/data-cleaning/conversion/address-from-user.xq (Failed)
        2520 - zorba_data-cleaning_module/data-cleaning/conversion/phone-from-user.xq (Failed)
        2523 - zorba_data-cleaning_module/data-cleaning/conversion/user-from-phone.xq (Failed)
Errors while running CTest

Moreover, I don't see any changes in the diff in any files related to the "address-from-user.xq" test.

review: Needs Fixing

[Gabriel Petrovay (gabipetrovay)]

I was wrong. It FIXES the issue.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_dc-2011-12-23T13-04-38.956Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix_bug_dc into lp:zorba/data-cleaning-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job fix_bug_dc-2011-12-23T13-04-38.956Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_dc-2011-12-23T13-08-35.284Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix_bug_dc into lp:zorba/data-cleaning-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job fix_bug_dc-2011-12-23T13-08-35.284Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Diogo Simões (diogo-simoes89)]

review: Approve

[Chris Hillery (ceejatec)]

Not sure why the "conflicting tags" problem only seems to have affected this merge proposal, but at any rate, I've fixed it on the remote queue machine and put code in to prevent it happening in future.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_dc-2011-12-23T20-23-35.246Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_dc-2011-12-23T20-23-35.246Z is finished. The final status was:

All tests succeeded!

[Bruno Martins (bgmartins)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-10-09 00:22:42 +0000
+++ CMakeLists.txt	2011-12-22 14:00:41 +0000
@@ -25,10 +25,6 @@
 
 ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test" "${EXCEPTION_LIST}")
 
-EXPECTED_FAILURE(zorba_data-cleaning_module/data-cleaning/conversion/address-from-user.xq 871051)
-EXPECTED_FAILURE(zorba_data-cleaning_module/data-cleaning/conversion/phone-from-user.xq 871051)
-EXPECTED_FAILURE(zorba_data-cleaning_module/data-cleaning/conversion/user-from-phone.xq 871051)
-
 ADD_SUBDIRECTORY("src")
 
 DONE_DECLARING_ZORBA_URIS()

=== modified file 'test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res	2011-07-19 19:12:03 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/phone-from-address.xml.res	2011-12-22 14:00:41 +0000
@@ -1,1 +1,1 @@
-[phone]
\ No newline at end of file
+[phone] [phone]
\ No newline at end of file

=== modified file 'test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res	2011-10-17 10:05:58 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/phone-from-user.xml.res	2011-12-22 14:00:41 +0000
@@ -1,1 +0,0 @@
-[phone] [phone] [phone] [phone] [phone] [phone] [phone] [phone] [phone] [phone] [phone]

=== added file 'test/ExpQueryResults/data-cleaning/conversion/unit-convert.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/unit-convert.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/unit-convert.xml.res	2011-12-22 14:00:41 +0000
@@ -0,0 +1,1 @@
+1.609344
\ No newline at end of file

=== modified file 'test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res'
--- test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res	2011-07-19 19:12:03 +0000
+++ test/ExpQueryResults/data-cleaning/conversion/user-from-address.xml.res	2011-12-22 14:00:41 +0000
@@ -1,1 +1,1 @@
-Stan Smith
\ No newline at end of file
+Sunizona Greenhouses Inc Stan Smith
\ No newline at end of file