Remove repeated test scenarios. (#28669)

sdks/python/apache_beam/examples/wordcount_it_test.py

@@ -45,6 +45,7 @@ class WordCountIT(unittest.TestCase):
   DEFAULT_CHECKSUM = '33535a832b7db6d78389759577d4ff495980b9c0'
 
   @pytest.mark.it_postcommit
+  @pytest.mark.it_validatescontainer
   def test_wordcount_it(self):
     self._run_wordcount_it(wordcount.run)
 
@@ -89,11 +90,6 @@ def test_wordcount_impersonation_it(self):
       with auth._Credentials._credentials_lock:
         auth._Credentials._credentials_init = False
 
-  @pytest.mark.it_postcommit
-  @pytest.mark.it_validatescontainer
-  def test_wordcount_fnapi_it(self):
-    self._run_wordcount_it(wordcount.run, experiment='beam_fn_api')
-
   @pytest.mark.it_validatescontainer
   def test_wordcount_it_with_prebuilt_sdk_container_local_docker(self):
     self._run_wordcount_it(
@@ -108,10 +104,6 @@ def test_wordcount_it_with_prebuilt_sdk_container_cloud_build(self):
         experiment='beam_fn_api',
         prebuild_sdk_container_engine='cloud_build')
 
-  @pytest.mark.it_validatescontainer
-  def test_wordcount_it_with_use_sibling_sdk_workers(self):
-    self._run_wordcount_it(wordcount.run, experiment='use_sibling_sdk_workers')
-
   def _run_wordcount_it(self, run_wordcount, **opts):
     test_pipeline = TestPipeline(is_integration_test=True)
     extra_opts = {}

sdks/python/apache_beam/runners/dataflow/dataflow_exercise_metrics_pipeline_test.py

@@ -51,16 +51,6 @@ def test_metrics_it(self):
         dataflow_exercise_metrics_pipeline.metric_matchers())
     self.assertFalse(errors, str(errors))
 
-  @pytest.mark.it_postcommit
-  @pytest.mark.it_validatescontainer
-  @unittest.skip('https://github.com/apache/beam/issues/22605')
-  def test_metrics_fnapi_it(self):
-    result = self.run_pipeline(experiment='beam_fn_api')
-    errors = metric_result_matchers.verify_all(
-        result.metrics().all_metrics(),
-        dataflow_exercise_metrics_pipeline.metric_matchers())
-    self.assertFalse(errors, str(errors))
-
 
 if __name__ == '__main__':
   unittest.main()