From 34fc493b64c977d6c69bc364c9628749b1467dd8 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <hlinnakangas@pivotal.io>
Date: Tue, 14 Feb 2017 20:57:08 +0200
Subject: [PATCH] Simplify xpath test, to not use gpfdist, and move out of
 bugbuster.

I don't see any reason to expect that this would behave differently with
an external table than a normal one.

Move the test from bugbuster to the normal regression suite.
---
 src/test/regress/bugbuster/known_good_schedule    |  2 +-
 src/test/regress/{bugbuster => }/data/CD.xml      |  0
 .../regress/{bugbuster => }/expected/xpath.out    | 11 +++--------
 src/test/regress/greenplum_schedule               |  2 +-
 src/test/regress/{bugbuster => }/sql/xpath.sql    | 15 +++++----------
 5 files changed, 10 insertions(+), 20 deletions(-)
 rename src/test/regress/{bugbuster => }/data/CD.xml (100%)
 rename src/test/regress/{bugbuster => }/expected/xpath.out (98%)
 rename src/test/regress/{bugbuster => }/sql/xpath.sql (86%)

diff --git a/src/test/regress/bugbuster/known_good_schedule b/src/test/regress/bugbuster/known_good_schedule
index 1bbebb47ad..6e86a43211 100644
--- a/src/test/regress/bugbuster/known_good_schedule
+++ b/src/test/regress/bugbuster/known_good_schedule
@@ -2,7 +2,7 @@
 ## TODO: list test sequence and test dependencies.
 ##
 ignore: jdbc
-test: load_mpph xpath
+test: load_mpph
 # these tests depend on load_mpph
 test: mpph_query mpph_aopart hashagg gpsort
 test: mpp-11333
diff --git a/src/test/regress/bugbuster/data/CD.xml b/src/test/regress/data/CD.xml
similarity index 100%
rename from src/test/regress/bugbuster/data/CD.xml
rename to src/test/regress/data/CD.xml
diff --git a/src/test/regress/bugbuster/expected/xpath.out b/src/test/regress/expected/xpath.out
similarity index 98%
rename from src/test/regress/bugbuster/expected/xpath.out
rename to src/test/regress/expected/xpath.out
index dbc830560b..6cb7ae19cb 100644
--- a/src/test/regress/bugbuster/expected/xpath.out
+++ b/src/test/regress/expected/xpath.out
@@ -1,15 +1,11 @@
 set xmloption='document';
 set optimizer_disable_missing_stats_collection = on;
-\! gpfdist -p 45555 -d bugbuster/data &> bugbuster/data/xpath_gpfdist.out &
--- apparently this is needed on darwin
-\! sleep 5
-\echo --start_ignore
 --start_ignore
-drop external table if exists readxml;
+drop table table if exists readxml;
 NOTICE:  table "readxml" does not exist, skipping
-\echo --end_ignore
 --end_ignore
-create readable external table readxml (text xml) location ('gpfdist://localhost:45555/CD.xml') format 'TEXT' (escape 'off' newline as 'CRLF');
+create table readxml (text xml);
+\copy readxml from 'data/CD.xml' with escape 'off' newline as 'CRLF';
 select xml_in('<a></a>');
  xml_in  
 ---------
@@ -761,4 +757,3 @@ select xml_is_well_formed_content('<adf>adsfasdf');
  f
 (1 row)
 
-\! ps -ef | grep "gpfdist -p 45555" | grep -v grep | awk '{print $2}' | xargs kill &> bugbuster/data/xpath_kill_gpfdist.out
diff --git a/src/test/regress/greenplum_schedule b/src/test/regress/greenplum_schedule
index 82ae720a30..25f428aa9f 100755
--- a/src/test/regress/greenplum_schedule
+++ b/src/test/regress/greenplum_schedule
@@ -16,7 +16,7 @@
 #
 
 test: variadic_parameters default_parameters function_extensions
-test: spi
+test: spi xpath
 
 test: leastsquares opr_sanity_gp decode_expr bitmapscan bitmapscan_ao case_gp limit_gp notin percentile naivebayes join_gp union_gp gpcopy gp_create_table
 test: filter gpctas gpdist matrix toast sublink table_functions olap_setup complex opclass_ddl information_schema guc_env_var
diff --git a/src/test/regress/bugbuster/sql/xpath.sql b/src/test/regress/sql/xpath.sql
similarity index 86%
rename from src/test/regress/bugbuster/sql/xpath.sql
rename to src/test/regress/sql/xpath.sql
index 8b9d188ee2..1d115a9732 100644
--- a/src/test/regress/bugbuster/sql/xpath.sql
+++ b/src/test/regress/sql/xpath.sql
@@ -1,15 +1,13 @@
 set xmloption='document';
 set optimizer_disable_missing_stats_collection = on;
-\! gpfdist -p 45555 -d bugbuster/data &> bugbuster/data/xpath_gpfdist.out &
--- apparently this is needed on darwin
-\! sleep 5
 
-\echo --start_ignore
-drop external table if exists readxml;
-\echo --end_ignore
+--start_ignore
+drop table if exists readxml;
+--end_ignore
 
-create readable external table readxml (text xml) location ('gpfdist://localhost:45555/CD.xml') format 'TEXT' (escape 'off' newline as 'CRLF');
+create table readxml (text xml);
 
+\copy readxml from 'data/CD.xml' with escape 'off' newline as 'CRLF';
 
 select xml_in('<a></a>');
 select xml_in('<a></>');
@@ -99,6 +97,3 @@ select xml_is_well_formed_content(text((select * from readxml)));
 
 select xml_is_well_formed_content('<adf>adsfasdf<adf>');
 select xml_is_well_formed_content('<adf>adsfasdf');
-
-\! ps -ef | grep "gpfdist -p 45555" | grep -v grep | awk '{print $2}' | xargs kill &> bugbuster/data/xpath_kill_gpfdist.out
-
-- 
GitLab