From 047f58dbcf23d4eac98007519e8af2c2f443533f Mon Sep 17 00:00:00 2001
From: Noah Watkins <noahwatkins@gmail.com>
Date: Fri, 26 Oct 2012 13:28:52 -0700
Subject: [PATCH] java: use unique directory in test

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---
 src/java/test/CephMountCreateTest.java | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/java/test/CephMountCreateTest.java b/src/java/test/CephMountCreateTest.java
index e8e3a510cccb..c5e5b36c2fd4 100644
--- a/src/java/test/CephMountCreateTest.java
+++ b/src/java/test/CephMountCreateTest.java
@@ -19,6 +19,7 @@
  */
 import java.io.FileNotFoundException;
 import org.junit.*;
+import java.util.UUID;
 import static org.junit.Assert.*;
 
 import com.ceph.fs.*;
@@ -52,37 +53,38 @@ public class CephMountCreateTest {
     CephMount mount;
     boolean found;
 
+    String dir = "libcephfs_junit_" + UUID.randomUUID();
+
     /* root dir has more than one dir */
-    mount = setupMount(null);
+    mount = setupMount("/");
 
     try {
-      mount.rmdir("/libcephfs_java_test_dir");
+      mount.rmdir("/" + dir);
     } catch (FileNotFoundException e) {}
-    mount.mkdirs("/libcephfs_java_test_dir", 777);
+    mount.mkdirs("/" + dir, 777);
     String[] subdirs = mount.listdir("/");
     found = false;
     for (String d : subdirs) {
-      if (d.compareTo("libcephfs_java_test_dir") == 0)
+      if (d.compareTo(dir) == 0)
         found = true;
     }
     assertTrue(found);
     mount.unmount();
 
     /* changing root to empty dir */
-    mount = setupMount("/libcephfs_java_test_dir");
+    mount = setupMount("/" + dir);
 
     subdirs = mount.listdir("/");
     found = false;
     for (String d : subdirs) {
-      if (d.compareTo(".") != 0 && d.compareTo("..") != 0)
-        found = true;
+      found = true;
     }
     assertFalse(found);
     mount.unmount();
 
     /* cleanup */
-    mount = setupMount(null);
-    mount.rmdir("/libcephfs_java_test_dir");
+    mount = setupMount("/");
+    mount.rmdir("/" + dir);
     mount.unmount();
   }
 }
-- 
2.47.3