Attempting to de-flake the fileapi_test

tests/html/fileapi_test.dart

 library fileapi;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 import 'dart:async';
 
 class FileAndDir {
   FileEntry file;
   DirectoryEntry dir;
   FileAndDir(this.file, this.dir);
@@ skipping 74 matching lines @@
             expect(new DateTime.now().difference(changeTime).inMinutes,
                 lessThan(4));
             expect(metadata.size, equals(0));
           });
         });
     }
   });
 
   // Do the boilerplate to get several files and directories created to then
   // test the functions that use those items.
-  Future doDirSetup() {
+  Future doDirSetup(String testName) {
     return fs.root.createFile(
-      'file4')
+      'file_$testName')
         .then((FileEntry file) {
           return fs.root.createDirectory(
-              'directory3')
+              'dir_$testName')
             .then((DirectoryEntry dir) {
               return new Future.value(new FileAndDir(file, dir));
             });
         });
   }
 
   group('directoryReader', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
       test('readEntries', () {
-        return doDirSetup()
+        return doDirSetup('readEntries')
           .then((fileAndDir) {
             var reader = fileAndDir.dir.createReader();
             return reader.readEntries();
           }).then((entries) {
             expect(entries is List, true);
           });
       });
     }
   });
 
   group('entry', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
       test('copyTo', () {
-        return doDirSetup()
+        return doDirSetup('copyTo')
           .then((fileAndDir) {
             return fileAndDir.file.copyTo(fileAndDir.dir, name: 'copiedFile');
           }).then((entry) {
             expect(entry.isFile, true);
             expect(entry.name, 'copiedFile');
           });
       });
 
       test('getParent', () {
-        return doDirSetup()
+        return doDirSetup('getParent')
           .then((fileAndDir) {
              return fileAndDir.file.getParent();
           }).then((entry) {
             expect(entry.name, '');
             expect(entry.isFile, false);
           });
       });
 
       test('moveTo', () {
-        return doDirSetup()
+        return doDirSetup('moveTo')
           .then((fileAndDir) {
             return fileAndDir.file.moveTo(fileAndDir.dir, name: 'movedFile');
           }).then((entry) {
             expect(entry.name, 'movedFile');
-            expect(entry.fullPath, '/directory3/movedFile');
+            expect(entry.fullPath, '/dir_moveTo/movedFile');
             return fs.root.getFile('file4');
           }).catchError((error) {
             expect(error.code, equals(FileError.NOT_FOUND_ERR));
           }, test: (e) => e is FileError);
       });
 
       test('remove', () {
-        return doDirSetup()
+        return doDirSetup('remove')
           .then((fileAndDir) {
             return fileAndDir.file.remove().then((_) {});
           });
       });
     }
   });
 
   group('fileEntry', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
       test('createWriter', () {
-        return doDirSetup()
+        return doDirSetup('createWriter')
           .then((fileAndDir) {
             return fileAndDir.file.createWriter();
           }).then((writer) {
             expect(writer.position, 0);
             expect(writer.readyState, FileWriter.INIT);
             expect(writer.length, 0);
           });
       });
 
       test('file', () {
-        return doDirSetup()
+        return doDirSetup('file')
           .then((fileAndDir) {
             return fileAndDir.file.file()
               .then((fileObj) {
                 expect(fileObj.name, fileAndDir.file.name);
                 expect(fileObj.relativePath, '');
                 expect(new DateTime.now().difference(
                     fileObj.lastModifiedDate).inSeconds, lessThan(60));
               });
           });
       });
     }
   });
 }