[NOJIRA]

Replaced /tmp with <userhome>/groovytest
TIER · Aug 23, 2018 · 34b084e · 34b084e
1 parent a68bcf6
commit 34b084e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy b/...t2/tier/shibboleth/admin/ui/controller/MetadataResolversControllerIntegrationTests.groovy
@@ -160,6 +160,13 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         result.statusCodeValue == 201
         result.headers.Location[0].contains(BASE_URI)
 
+        cleanup:
+        def userHome = System.getProperty("user.home")
+        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
+        if (tmpDirectory.exists()) {
+            tmpDirectory.deleteDir()
+        }
+
         where:
             resolverType     | _
             'DynamicHttp'    | _
@@ -196,6 +203,13 @@ class MetadataResolversControllerIntegrationTests extends Specification {
         then:
         updatedResolverMap.name == 'Updated DynamicHttpMetadataResolver'
 
+        cleanup:
+        def userHome = System.getProperty("user.home")
+        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
+        if (tmpDirectory.exists()) {
+            tmpDirectory.deleteDir()
+        }
+
         where:
             resolverType     | _
             'DynamicHttp'    | _

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -483,10 +483,15 @@ class TestObjectGenerator {
     }
 
     LocalDynamicMetadataResolver localDynamicMetadataResolver() {
+        def userHome = System.getProperty("user.home")
+        def tmpDirectory = new File(userHome + File.separator + 'groovytest')
+        if (!tmpDirectory.exists()) {
+            tmpDirectory.mkdir()
+        }
         new LocalDynamicMetadataResolver().with {
             it.name = 'LocalDynamic'
             it.xmlId = 'LocalDynamic'
-            it.sourceDirectory = '/tmp'
+            it.sourceDirectory = userHome + File.separator + 'groovytest'
             it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with {
                 it
             }