Merge Pull Request #10623 from e10harvey/Trilinos/issue10622

Automatically Merged using Trilinos Pull Request AutoTester PR Title: packages/framework: Try to override dynamic package enables PR Author: e10harvey
trilinos · Jun 16, 2022 · af47f04 · af47f04
2 parents 464629d + 6575b12
commit af47f04
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/framework/pr_tools/pullrequest-specs.ini b/packages/framework/pr_tools/pullrequest-specs.ini
@@ -11,7 +11,7 @@
 # - `package_subproject_list.cmake` and
 #
 # Instead of using the TriBiTS tool to determine changes.
-python-3: TrilinosFrameworkTests
+Trilinos_PR_python3: TrilinosFrameworkTests
 Trilinos-pullrequest-gcc-8.3.0-installation-testing A: Teuchos
 Trilinos-pullrequest-gcc-8.3.0-installation-testing B: Tpetra
 #

diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini b/packages/framework/pr_tools/trilinosprhelpers/unittests/pullrequest-specs.ini
@@ -11,7 +11,7 @@
 # - `package_subproject_list.cmake` and
 #
 # Instead of using the TriBiTS tool to determine changes.
-python-3: TrilinosFrameworkTests
+Trilinos_PR_python3: TrilinosFrameworkTests
 Trilinos-pullrequest-gcc-8.3.0-installation-testing A: Teuchos
 Trilinos-pullrequest-gcc-8.3.0-installation-testing B: Tpetra
 #

diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py b/packages/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationBase.py
@@ -250,8 +250,8 @@ def dummy_args_python3(self):
         Generate dummy command line arguments
         """
         args = copy.deepcopy(self.dummy_args())
-        args.pullrequest_build_name = "python-3"
-        args.genconfig_build_name = "python-3"
+        args.pullrequest_build_name = "Trilinos_PR_python3"
+        args.genconfig_build_name = "Trilinos_PR_python3"
         return args
 
 

diff --git a/...es/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py b/...es/framework/pr_tools/trilinosprhelpers/unittests/test_TrilinosPRConfigurationStandard.py
@@ -236,7 +236,7 @@ def test_TrilinosPRConfigurationStandardPython3(self):
         - Change args to enable dry_run mode.
         """
         args = self.dummy_args()
-        args.pullrequest_build_name = "python-3"
+        args.pullrequest_build_name = "Trilinos_PR_python3"
         pr_config = trilinosprhelpers.TrilinosPRConfigurationStandard(args)
 
         # prepare step