From 34bede7b743fd6775f77f786163b02a89f4c0971 Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@fb.com>
Date: Sun, 29 Mar 2015 09:41:30 -0700
Subject: [PATCH] travis: speculative diff to reduce travis noise

Looks like we need to wait longer for the since-term test to settle,
so let's assert the file list before we sample our first clock.

Stop skipping the kFSEventStreamEventFlagRootChanged case; this
does actually work.
---
 tests/integration/remove.php        | 7 -------
 tests/integration/since-term.php    | 5 +++++
 tests/integration/trigger-chdir.php | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/integration/remove.php b/tests/integration/remove.php
index 56c8faec5d76..40185aa24481 100644
--- a/tests/integration/remove.php
+++ b/tests/integration/remove.php
@@ -47,10 +47,6 @@ function testRemove() {
     if (PHP_OS == 'Linux' && getenv('TRAVIS')) {
       $this->assertSkipped('openvz and inotify unlinks == bad time');
     }
-    if (PHP_OS == 'Darwin') {
-      $this->assertSkipped(
-        "fseventsd doesn't signal kFSEventStreamEventFlagRootChanged");
-    }
     $watches = $this->waitForWatchman(
       array('watch-list'),
       function ($list) use ($root) {
@@ -64,6 +60,3 @@ function ($list) use ($root) {
     );
   }
 }
-
-
-
diff --git a/tests/integration/since-term.php b/tests/integration/since-term.php
index cee9d2ab0ddf..c33113713450 100644
--- a/tests/integration/since-term.php
+++ b/tests/integration/since-term.php
@@ -13,6 +13,11 @@ function testSinceExpr() {
     touch("$root/subdir/bar.txt");
 
     $this->watch($root);
+    $this->assertFileList($root, array(
+      'foo.c',
+      'subdir',
+      'subdir/bar.txt'
+    ));
 
     $foo_data = $this->watchmanCommand('find', $root, 'foo.c');
     $first_clock = $foo_data['clock'];
diff --git a/tests/integration/trigger-chdir.php b/tests/integration/trigger-chdir.php
index 638d05940e85..b2f49ab9c85d 100644
--- a/tests/integration/trigger-chdir.php
+++ b/tests/integration/trigger-chdir.php
@@ -34,7 +34,7 @@ function testChdir() {
 
     $this->waitFor(
       function () use ($env, $root) {
-        $envdata = file_get_contents($env);
+        $envdata = @file_get_contents($env);
         return preg_match(",PWD=$root/sub,", $envdata) == 1;
       },
       10,