Remove discovery re-attempts from NS CrOS->CrOS tests
We no longer need these discovery retries in the tests to debug issues
on grunt. Remove them to consolidate failures for better test reporting.
BUG=b:240180328
TEST=group:nearby-share-remote
Change-Id: Ic47e069935dd92e4fe67b82d1104e162ea7e609e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tast-tests/+/3808275
Reviewed-by: David Haddock <dhaddock@chromium.org>
Commit-Queue: David Haddock <dhaddock@chromium.org>
Tested-by: Kyle Shimabukuro <kyleshima@chromium.org>
Auto-Submit: Kyle Shimabukuro <kyleshima@chromium.org>
(cherry picked from commit d4940c4625b7c87e6d76e4cd8e6fef2c324a0611)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tast-tests/+/3821722
Tested-by: David Haddock <dhaddock@chromium.org>
Auto-Submit: David Haddock <dhaddock@chromium.org>
Commit-Queue: Kyle Shimabukuro <kyleshima@chromium.org>
Reviewed-by: Kyle Shimabukuro <kyleshima@chromium.org>
diff --git a/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_high_vis.go b/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_high_vis.go
index d31c59b..4c08960 100644
--- a/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_high_vis.go
+++ b/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_high_vis.go
@@ -12,7 +12,6 @@
"github.com/golang/protobuf/ptypes/empty"
nearbycommon "chromiumos/tast/common/cros/nearbyshare"
- "chromiumos/tast/ctxutil"
"chromiumos/tast/errors"
remotenearby "chromiumos/tast/remote/cros/nearbyshare"
"chromiumos/tast/services/cros/nearbyservice"
@@ -36,7 +35,7 @@
ExtraAttr: []string{"group:nearby-share-cq"},
Val: nearbycommon.TestData{Filename: "small_png.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_png.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataoffline_allcontacts_jpg11kb",
@@ -44,7 +43,7 @@
ExtraAttr: []string{"group:nearby-share-cq"},
Val: nearbycommon.TestData{Filename: "small_jpg.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_jpg.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataonline_noone_txt30mb",
@@ -53,7 +52,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
{
Name: "dataonline_noone_txt30mb_webrtc_and_wlan",
@@ -61,7 +60,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
{
Name: "dataonline_noone_txt30mb_webrtc",
@@ -69,7 +68,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
{
Name: "dataonline_noone_txt30mb_wlan",
@@ -77,7 +76,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
},
})
@@ -91,15 +90,8 @@
senderDisplayName := s.FixtValue().(*remotenearby.FixtData).SenderDisplayName
receiverDisplayName := s.FixtValue().(*remotenearby.FixtData).ReceiverDisplayName
- // b/228377059: reserve time to toggle bluetooth and retry discovery on failure.
- // Use a shortened ctx for the initial discovery phase. The remaining ctx time will
- // be reserved for retrying discovery if necessary, and completing the transfer.
- // Remove retry logic once b/228377059 is resolved.
- discoveryCtx, cancel := ctxutil.Shorten(ctx, nearbycommon.DetectionTimeout)
- defer cancel()
-
s.Log("Starting receiving on DUT2 (Receiver)")
- if _, err := receiver.StartReceiving(discoveryCtx, &empty.Empty{}); err != nil {
+ if _, err := receiver.StartReceiving(ctx, &empty.Empty{}); err != nil {
s.Fatal("Failed to start receiving on DUT2 (Receiver): ", err)
}
@@ -107,35 +99,21 @@
testData := s.Param().(nearbycommon.TestData)
remoteFile := filepath.Join(remoteFilePath, testData.Filename)
fileReq := &nearbyservice.CrOSPrepareFileRequest{FileName: remoteFile}
- fileNames, err := sender.PrepareFiles(discoveryCtx, fileReq)
+ fileNames, err := sender.PrepareFiles(ctx, fileReq)
if err != nil {
s.Fatal("Failed to prepare files for sending on DUT1 (Sender): ", err)
}
sendReq := &nearbyservice.CrOSSendFilesRequest{FileNames: fileNames.FileNames}
- _, err = sender.StartSend(discoveryCtx, sendReq)
+ _, err = sender.StartSend(ctx, sendReq)
if err != nil {
s.Fatal("Failed to start send on DUT1 (Sender): ", err)
}
s.Log("Selecting Receiver's (DUT2) share target on Sender (DUT1)")
targetReq := &nearbyservice.CrOSSelectShareTargetRequest{ReceiverName: receiverDisplayName, CollectShareToken: true}
- var sendingRetried bool
- senderShareToken, err := sender.SelectShareTarget(discoveryCtx, targetReq)
+ senderShareToken, err := sender.SelectShareTarget(ctx, targetReq)
if err != nil {
- s.Log("Failed to select share target on DUT1 (Sender): ", err)
- // b/228377059: Retry sending after toggling bluetooth. Remove retries once resolved.
- s.Log("Retrying sending")
- sendingRetried = true
- if _, err := sender.DisableBluetooth(ctx, &empty.Empty{}); err != nil {
- s.Fatal("(Discovery re-attempt) Failed to disable bluetooth on the sender: ", err)
- }
- if _, err := sender.EnableBluetooth(ctx, &empty.Empty{}); err != nil {
- s.Fatal("(Discovery re-attempt) Failed to re-enable bluetooth on the sender: ", err)
- }
- senderShareToken, err = sender.SelectShareTarget(ctx, targetReq)
- if err != nil {
- s.Fatal("(Discovery re-attempt) Failed to select share target on DUT1 (Sender): ", err)
- }
+ s.Fatal("Failed to select share target on DUT1 (Sender): ", err)
}
s.Log("Accepting the share request on DUT2 (Receiver)")
transferTimeoutSeconds := int32(testData.TransferTimeout.Seconds())
@@ -175,8 +153,4 @@
s.Fatal("Failed file hash comparison: ", err)
}
s.Log("Share completed and file hashes match on both DUTs")
-
- if sendingRetried {
- s.Fatal("(Discovery re-attempt) First sending attempt failed, but second attempt succeeded")
- }
}
diff --git a/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_in_contacts.go b/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_in_contacts.go
index 9651de6..1c20310 100644
--- a/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_in_contacts.go
+++ b/src/chromiumos/tast/remote/bundles/cros/nearbyshare/cros_to_cros_in_contacts.go
@@ -8,10 +8,7 @@
"context"
"path/filepath"
- "github.com/golang/protobuf/ptypes/empty"
-
nearbycommon "chromiumos/tast/common/cros/nearbyshare"
- "chromiumos/tast/ctxutil"
remotenearby "chromiumos/tast/remote/cros/nearbyshare"
"chromiumos/tast/services/cros/nearbyservice"
"chromiumos/tast/testing"
@@ -32,28 +29,28 @@
Fixture: "nearbyShareRemoteDataUsageOfflineAllContacts",
Val: nearbycommon.TestData{Filename: "small_png.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_png.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataoffline_allcontacts_jpg11kb",
Fixture: "nearbyShareRemoteDataUsageOfflineAllContacts",
Val: nearbycommon.TestData{Filename: "small_jpg.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_jpg.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataoffline_somecontacts_png5kb",
Fixture: "nearbyShareRemoteDataUsageOfflineSomeContacts",
Val: nearbycommon.TestData{Filename: "small_png.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_png.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataoffline_somecontacts_jpg11kb",
Fixture: "nearbyShareRemoteDataUsageOfflineSomeContacts",
Val: nearbycommon.TestData{Filename: "small_jpg.zip", TransferTimeout: nearbycommon.SmallFileTransferTimeout},
ExtraData: []string{"small_jpg.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.SmallFileTransferTimeout,
},
{
Name: "dataonline_allcontacts_txt30mb",
@@ -61,7 +58,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
{
Name: "dataonline_somecontacts_txt30mb",
@@ -69,7 +66,7 @@
Val: nearbycommon.TestData{
Filename: "big_txt.zip", TransferTimeout: nearbycommon.LargeFileOnlineTransferTimeout},
ExtraData: []string{"big_txt.zip"},
- Timeout: 2*nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
+ Timeout: nearbycommon.DetectionTimeout + nearbycommon.LargeFileOnlineTransferTimeout,
},
},
})
@@ -83,45 +80,25 @@
senderDisplayName := s.FixtValue().(*remotenearby.FixtData).SenderDisplayName
receiverDisplayName := s.FixtValue().(*remotenearby.FixtData).ReceiverDisplayName
- // b/228377059: reserve time to toggle bluetooth and retry discovery on failure.
- // Use a shortened ctx for the initial discovery phase. The remaining ctx time will
- // be reserved for retrying discovery if necessary, and completing the transfer.
- // Remove retry logic once b/228377059 is resolved.
- discoveryCtx, cancel := ctxutil.Shorten(ctx, nearbycommon.DetectionTimeout)
- defer cancel()
-
s.Log("Starting sending on DUT1 (Sender)")
testData := s.Param().(nearbycommon.TestData)
remoteFile := filepath.Join(remoteFilePath, testData.Filename)
fileReq := &nearbyservice.CrOSPrepareFileRequest{FileName: remoteFile}
- fileNames, err := sender.PrepareFiles(discoveryCtx, fileReq)
+ fileNames, err := sender.PrepareFiles(ctx, fileReq)
if err != nil {
s.Fatal("Failed to prepare files for sending on DUT1 (Sender): ", err)
}
sendReq := &nearbyservice.CrOSSendFilesRequest{FileNames: fileNames.FileNames}
- _, err = sender.StartSend(discoveryCtx, sendReq)
+ _, err = sender.StartSend(ctx, sendReq)
if err != nil {
s.Fatal("Failed to start send on DUT1 (Sender): ", err)
}
s.Log("Selecting Receiver's (DUT2) share target on Sender (DUT1)")
targetReq := &nearbyservice.CrOSSelectShareTargetRequest{ReceiverName: receiverDisplayName, CollectShareToken: false}
- var sendingRetried bool
- _, err = sender.SelectShareTarget(discoveryCtx, targetReq)
+ _, err = sender.SelectShareTarget(ctx, targetReq)
if err != nil {
- s.Log("Failed to select share target on DUT1 (Sender): ", err)
- // b/228377059: Retry sending after toggling bluetooth. Remove retries once resolved.
- s.Log("Retrying sending")
- sendingRetried = true
- if _, err := sender.DisableBluetooth(ctx, &empty.Empty{}); err != nil {
- s.Fatal("(Discovery re-attempt) Failed to disable bluetooth on the sender: ", err)
- }
- if _, err := sender.EnableBluetooth(ctx, &empty.Empty{}); err != nil {
- s.Fatal("(Discovery re-attempt) Failed to re-enable bluetooth on the sender: ", err)
- }
- if _, err := sender.SelectShareTarget(ctx, targetReq); err != nil {
- s.Fatal("(Discovery re-attempt) Failed to select share target on DUT1 (Sender): ", err)
- }
+ s.Fatal("Failed to select share target on DUT1 (Sender): ", err)
}
s.Log("Accepting the share request on DUT2 (Receiver) via a notification")
@@ -152,8 +129,4 @@
}
}
s.Log("Share completed and file hashes match on both DUTs")
-
- if sendingRetried {
- s.Fatal("(Discovery re-attempt) First sending attempt failed, but second attempt succeeded")
- }
}
diff --git a/src/chromiumos/tast/remote/cros/nearbyshare/fixture.go b/src/chromiumos/tast/remote/cros/nearbyshare/fixture.go
index b4c621e..bca6127 100644
--- a/src/chromiumos/tast/remote/cros/nearbyshare/fixture.go
+++ b/src/chromiumos/tast/remote/cros/nearbyshare/fixture.go
@@ -520,9 +520,4 @@
if _, err := f.receiver.ClearTransferredFiles(ctx, &empty.Empty{}); err != nil {
s.Error("Failed to clear transferred files from the Downloads folder on the receiver: ", err)
}
-
- // b/228377059: re-enable bluetooth on the sender, in case it was not successfully re-enabled in a test.
- if _, err := f.sender.EnableBluetooth(ctx, &empty.Empty{}); err != nil {
- s.Fatal("Failed to enable bluetooth on the sender: ", err)
- }
}