Merge remote-tracking branch 'upstream/6.x' into 7.x

joshcooper · joshcooper · commit 5eb701b7f569 · 2023-02-27T15:45:05.000-08:00
* upstream/6.x:
  (maint) Skip tests that use test forge instance
diff --git a/acceptance/tests/modules/changes/module_with_modified_file.rb b/acceptance/tests/modules/changes/module_with_modified_file.rb
@@ -1,4 +1,5 @@
 test_name 'puppet module changes (on a module with a modified file)'
+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"
 
 tag 'audit:high',
     'audit:acceptance',
diff --git a/acceptance/tests/modules/changes/module_with_removed_file.rb b/acceptance/tests/modules/changes/module_with_removed_file.rb
@@ -1,4 +1,5 @@
 test_name 'puppet module changes (on a module with a removed file)'
+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"
 
 tag 'audit:high',
     'audit:acceptance',
diff --git a/acceptance/tests/modules/changes/unmodified_module.rb b/acceptance/tests/modules/changes/unmodified_module.rb
@@ -1,4 +1,5 @@
 test_name 'puppet module changes (on an unmodified module)'
+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"
 
 tag 'audit:high',
     'audit:acceptance',
diff --git a/acceptance/tests/modules/list/with_environment.rb b/acceptance/tests/modules/list/with_environment.rb
@@ -1,4 +1,5 @@
 test_name 'puppet module list (with environment)'
+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"
 
 tag 'server',
     'audit:high',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`test_name 'puppet module changes (on a module with a modified file)'`
	`2`	`+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"`
`2`	`3`
`3`	`4`	`tag 'audit:high',`
`4`	`5`	`'audit:acceptance',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`test_name 'puppet module changes (on an unmodified module)'`
	`2`	`+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"`
`2`	`3`
`3`	`4`	`tag 'audit:high',`
`4`	`5`	`'audit:acceptance',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`test_name 'puppet module list (with environment)'`
	`2`	`+skip_test "The test forge instance's SSL cert expired, see ITHELP-60681"`
`2`	`3`
`3`	`4`	`tag 'server',`
`4`	`5`	`'audit:high',`