Fix test_primary_failure test case (apache#303)

* subprocess.check_output of python3, needs encoding
* Add @PLPYTHON_LANG_STR@ in the test_primary_failure.in.sql

Author: Xiaoran Wang

gpcontrib/diskquota/tests/CMakeLists.txt

@@ -26,7 +26,7 @@ RegressTarget_Add(regress
     EXPECTED_DIR ${regress_expected_DIR}
     RESULTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/regress/results
     DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
-    SCHEDULE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/regress/diskquota_schedule${EXPECTED_DIR_SUFFIX}
+    SCHEDULE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/regress/diskquota_schedule
     EXCLUDE_FAULT_INJECT_TEST ${exclude_fault_injector}
     REGRESS_OPTS
     --load-extension=gp_inject_fault

gpcontrib/diskquota/tests/regress/diskquota_schedule7

@@ -21,15 +21,21 @@ returns text as $$
 
     cmd = 'pg_ctl -l postmaster.log -D %s ' % datadir
     cmd = cmd + '-W -m %s %s' % (command_mode, command)
+    if 'plpython2u' == 'plpython2u':
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
+    else:
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True, encoding='utf8').replace('.', '')
 
-    return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
-$$ language plpythonu;
+$$ language plpython2u;
 create or replace function pg_recoverseg(datadir text, command text)
 returns text as $$
     import subprocess
     cmd = 'gprecoverseg -%s -d %s; exit 0; ' % (command, datadir)
-    return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
-$$ language plpythonu;
+    if 'plpython2u' == 'plpython2u':
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
+    else:
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True, encoding='utf8').replace('.', '')
+$$ language plpython2u;
 CREATE TABLE a(i int) DISTRIBUTED BY (i);
 NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Greenplum Database data distribution key for this table.
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.

gpcontrib/diskquota/tests/regress/expected/test_primary_failure.out

@@ -1,7 +1,7 @@
 CREATE SCHEMA ftsr;
 SELECT diskquota.set_schema_quota('ftsr', '1 MB');
 SET search_path TO ftsr;
-create or replace language plpythonu;
+create or replace language @PLPYTHON_LANG_STR@;
 --
 -- pg_ctl:
 --   datadir: data directory of process to target with `pg_ctl`
@@ -16,16 +16,22 @@ returns text as $$
 
     cmd = 'pg_ctl -l postmaster.log -D %s ' % datadir
     cmd = cmd + '-W -m %s %s' % (command_mode, command)
+    if '@PLPYTHON_LANG_STR@' == 'plpython2u':
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
+    else:
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True, encoding='utf8').replace('.', '')
 
-    return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
-$$ language plpythonu;
+$$ language @PLPYTHON_LANG_STR@;
 
 create or replace function pg_recoverseg(datadir text, command text)
 returns text as $$
     import subprocess
     cmd = 'gprecoverseg -%s -d %s; exit 0; ' % (command, datadir)
-    return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
-$$ language plpythonu;
+    if '@PLPYTHON_LANG_STR@' == 'plpython2u':
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).replace('.', '')
+    else:
+        return subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True, encoding='utf8').replace('.', '')
+$$ language @PLPYTHON_LANG_STR@;
 
 CREATE TABLE a(i int) DISTRIBUTED BY (i);
 INSERT INTO a SELECT generate_series(1,100);