Domain Reliability: Don't clear "upload pending" bit until upload starts

components/domain_reliability/scheduler_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/domain_reliability/scheduler.h"
 
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "components/domain_reliability/config.h"
 #include "components/domain_reliability/test_util.h"
@@ skipping 45 matching lines @@
            << callback_max_.InSeconds() << " seconds from now";
   }
 
   ::testing::AssertionResult CheckPendingUpload(TimeDelta expected_min,
                                                 TimeDelta expected_max) {
     DCHECK(scheduler_);
     DCHECK_LE(expected_min.InMicroseconds(), expected_max.InMicroseconds());
 
     if (callback_called_ && expected_min == callback_min_
                          && expected_max == callback_max_) {
+      callback_called_ = false;
       return ::testing::AssertionSuccess();
     }
 
     if (callback_called_) {
       return ::testing::AssertionFailure()
              << "expected upload between " << expected_min.InSeconds()
              << " and " << expected_max.InSeconds() << " seconds from now, "
              << "got upload between " << callback_min_.InSeconds()
              << " and " << callback_max_.InSeconds() << " seconds from now";
     } else {
@@ skipping 127 matching lines @@
   scheduler_->OnUploadComplete(false);
 
   ASSERT_TRUE(CheckPendingUpload(zero_delta(), max_delay() - min_delay()));
   time_.Advance(retry_interval());
 
   // T = min_delay + retry_interval; collector 0 should be active again.
   ASSERT_TRUE(CheckStartingUpload(0));
   scheduler_->OnUploadComplete(true);
 }
 
+TEST_F(DomainReliabilitySchedulerTest, BeaconWhilePending) {
+  CreateScheduler(1);
+
+  scheduler_->OnBeaconAdded();
+  ASSERT_TRUE(CheckPendingUpload(min_delay(), max_delay()));
+
+  // Second beacon should not call callback again.
+  scheduler_->OnBeaconAdded();
+  ASSERT_TRUE(CheckNoPendingUpload());
+  time_.Advance(min_delay());
+
+  // No pending upload after beacon.
+  ASSERT_TRUE(CheckStartingUpload(0));
+  scheduler_->OnUploadComplete(true);
+  ASSERT_TRUE(CheckNoPendingUpload());
+}
+
+TEST_F(DomainReliabilitySchedulerTest, BeaconWhileUploading) {
+  CreateScheduler(1);
+
+  scheduler_->OnBeaconAdded();
+  ASSERT_TRUE(CheckPendingUpload(min_delay(), max_delay()));
+  time_.Advance(min_delay());
+
+  // If a beacon arrives during the upload, a new upload should be pending.
+  ASSERT_TRUE(CheckStartingUpload(0));
+  scheduler_->OnBeaconAdded();
+  scheduler_->OnUploadComplete(true);
+  ASSERT_TRUE(CheckPendingUpload(min_delay(), max_delay()));
+
+  time_.Advance(min_delay());
+  ASSERT_TRUE(CheckStartingUpload(0));
+  scheduler_->OnUploadComplete(true);
+  ASSERT_TRUE(CheckNoPendingUpload());
+}
+
 }  // namespace domain_reliability