CI: Make pg_twophase as one job.

src/test/tinc/Makefile

@@ -103,38 +103,10 @@ filerep_end_to_end_full_mirror:
 filerep_end_to_end_incr_mirror:
 	$(TESTER) mpp.gpdb.tests.storage.filerep_end_to_end.test_filerep_e2e.FilerepE2EScenarioTestCase.test_incr_mirror
 
-
-# cs-pg-two-phase
-# The following targets are pulled from:
-# http://pulse-cloud.gopivotal.com/admin/projects/cs-pg-two-phase
-#
-# Refer to the properties of the pulse project and individual build
-# stages for configuration requirements.
-
-test_pg_twophase_01_10:
-	$(TESTER) $(DISCOVER) \
-	-s tincrepo/mpp/gpdb/tests/storage/pg_twophase \
-	-p test_pg_twophase_01_10.py
-
-test_pg_twophase_11_20:
-	$(TESTER) $(DISCOVER) \
-	-s tincrepo/mpp/gpdb/tests/storage/pg_twophase \
-	-p test_pg_twophase_11_20.py
-
-test_pg_twophase_21_30:
-	$(TESTER) $(DISCOVER) \
-	-s tincrepo/mpp/gpdb/tests/storage/pg_twophase \
-	-p test_pg_twophase_21_30.py
-
-test_pg_twophase_31_40:
-	$(TESTER) $(DISCOVER) \
-	-s tincrepo/mpp/gpdb/tests/storage/pg_twophase \
-	-p test_pg_twophase_31_40.py
-
-test_pg_twophase_41_49:
+test_pg_twophase:
 	$(TESTER) $(DISCOVER) \
 	-s tincrepo/mpp/gpdb/tests/storage/pg_twophase \
-	-p test_pg_twophase_41_49.py
+	-p test_pg_twophase.py
 
 test_switch_01_12:
 	$(TESTER) $(DISCOVER) \

src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase_01_10.py → src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase.py

@@ -19,15 +19,14 @@ import os
 import tinctest
 from mpp.gpdb.tests.storage.pg_twophase.pg_twophase import PgtwoPhaseTestCase
 
-class PgtwoPhase01To10(PgtwoPhaseTestCase):
+class PgtwoPhase01ToN(PgtwoPhaseTestCase):
     ''' 
     Testing state of prepared transactions upon crash-recovery
     @gucs gp_create_table_random_default_distribution=off
     '''
 
     def __init__(self, methodName):
-        super(PgtwoPhase01To10,self).__init__(methodName)
-    
+        super(PgtwoPhase01ToN,self).__init__(methodName)
 
     def test_execute_split_sqls_01_10(self):
         ''' 

src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase_11_20.py

-"""
-Copyright (c) 2004-Present Pivotal Software, Inc.
-
-This program and the accompanying materials are made available under
-the terms of the under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-import os
-import tinctest
-from mpp.gpdb.tests.storage.pg_twophase.pg_twophase import PgtwoPhaseTestCase
-
-class PgtwoPhase11To20(PgtwoPhaseTestCase):
-    ''' 
-    Testing state of prepared transactions upon crash-recovery
-    @gucs gp_create_table_random_default_distribution=off
-    '''
-
-    def __init__(self, methodName):
-        super(PgtwoPhase11To20,self).__init__(methodName)
-    
-
-    def test_execute_split_sqls_11_20(self):
-        ''' 
-        @data_provider data_types_provider
-        '''
-        skip_state = self.test_data[1][0]
-        cluster_state = self.test_data[1][1]
-        ddl_type = self.test_data[1][2]
-        fault_type = self.test_data[1][3]
-        crash_type = self.test_data[1][4]
-        self.execute_split_sqls(skip_state, cluster_state, ddl_type, fault_type, crash_type)
-        
-        
-@tinctest.dataProvider('data_types_provider')
-def test_data_provider():
-    data = {'17_skip_sync_drop_commit_gpstop_i': ['skip','sync','drop','commit','gpstop_i'],
-            }
-    return data
-        
-

src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase_21_30.py

-"""
-Copyright (c) 2004-Present Pivotal Software, Inc.
-
-This program and the accompanying materials are made available under
-the terms of the under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-import os
-import tinctest
-from mpp.gpdb.tests.storage.pg_twophase.pg_twophase import PgtwoPhaseTestCase
-
-class PgtwoPhase21To30(PgtwoPhaseTestCase):
-    ''' 
-    Testing state of prepared transactions upon crash-recovery
-    @gucs gp_create_table_random_default_distribution=off
-    '''
-
-    def __init__(self, methodName):
-        super(PgtwoPhase21To30,self).__init__(methodName)
-
-
-    def test_execute_split_sqls_21_30(self):
-        ''' 
-        @data_provider data_types_provider
-        '''
-        skip_state = self.test_data[1][0]
-        cluster_state = self.test_data[1][1]
-        ddl_type = self.test_data[1][2]
-        fault_type = self.test_data[1][3]
-        crash_type = self.test_data[1][4]
-        self.execute_split_sqls(skip_state, cluster_state, ddl_type, fault_type, crash_type)
-
-
-@tinctest.dataProvider('data_types_provider')
-def test_data_provider():
-    data = {'21_noskip_sync_drop_commit_gpstop_i': ['noskip','sync','drop','commit','gpstop_i'],
-            }
-    return data

src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase_31_40.py

-"""
-Copyright (c) 2004-Present Pivotal Software, Inc.
-
-This program and the accompanying materials are made available under
-the terms of the under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-import os
-import tinctest
-from mpp.gpdb.tests.storage.pg_twophase.pg_twophase import PgtwoPhaseTestCase
-
-class PgtwoPhase31To40(PgtwoPhaseTestCase):
-    ''' 
-    Testing state of prepared transactions upon crash-recovery
-    @gucs gp_create_table_random_default_distribution=off
-    '''
-
-    def __init__(self, methodName):
-        super(PgtwoPhase31To40,self).__init__(methodName)
-    
-
-    def test_execute_split_sqls_31_40(self):
-        ''' 
-        @data_provider data_types_provider
-        '''
-        skip_state = self.test_data[1][0]
-        cluster_state = self.test_data[1][1]
-        ddl_type = self.test_data[1][2]
-        fault_type = self.test_data[1][3]
-        crash_type = self.test_data[1][4]
-        self.execute_split_sqls(skip_state, cluster_state, ddl_type, fault_type, crash_type)
-        
-        
-@tinctest.dataProvider('data_types_provider')
-def test_data_provider():
-    data = {'33_skip_sync_create_abort_gpstop_i': ['skip','sync','create','abort','gpstop_i'],
-            '37_noskip_sync_create_abort_gpstop_i': ['noskip','sync','create','abort','gpstop_i'],
-            }
-    return data
-        
-

src/test/tinc/tincrepo/mpp/gpdb/tests/storage/pg_twophase/test_pg_twophase_41_49.py

-"""
-Copyright (c) 2004-Present Pivotal Software, Inc.
-
-This program and the accompanying materials are made available under
-the terms of the under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-import os
-import tinctest
-from mpp.gpdb.tests.storage.pg_twophase.pg_twophase import PgtwoPhaseTestCase
-
-class PgtwoPhase41To49(PgtwoPhaseTestCase):
-    '''
-    Testing state of prepared transactions upon crash-recovery
-    @gucs gp_create_table_random_default_distribution=off
-    '''
-
-    def __init__(self, methodName):
-        super(PgtwoPhase41To49,self).__init__(methodName)
-    
-
-    def test_execute_split_sqls_41_49(self):
-        ''' 
-        @data_provider data_types_provider
-        '''
-        skip_state = self.test_data[1][0]
-        cluster_state = self.test_data[1][1]
-        ddl_type = self.test_data[1][2]
-        fault_type = self.test_data[1][3]
-        crash_type = self.test_data[1][4]
-        self.execute_split_sqls(skip_state, cluster_state, ddl_type, fault_type, crash_type)
-        
-        
-@tinctest.dataProvider('data_types_provider')
-def test_data_provider():
-    data = {'49_noskip_sync_create_end_prepare_two_phase_sleep_gpstop_i' : ['noskip','sync','create','end_prepare_two_phase_sleep', 'gpstop_i']
-            }
-    return data