Revert "[gs_offloader] Fix for the change in the swarming filepath."
This reverts commit 1a6709bf61e4a811ffe5ed0f1ffa3d0d80ccce09.
Reason for revert: There is no change in swarming filepath, so this CL
actually broke CTS results offload.
Original change's description:
> [gs_offloader] Fix for the change in the swarming filepath.
>
> BUG=chromium:1012431
> TEST=unit test
>
> Change-Id: I6ba73e687cc97fefcf75373a4a5c36e8b6e4d442
> Reviewed-on: https://chromium-review.googlesource.com/1848431
> Tested-by: Keith Haddow <haddowk@chromium.org>
> Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
> Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
> Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
> Reviewed-by: Jason Kusuma <jkusuma@google.com>
Bug: chromium:1012431
Change-Id: I2ec5fc0faceb637d4d23302717d1b0da8db806ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1867177
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
diff --git a/site_utils/gs_offloader_unittest.py b/site_utils/gs_offloader_unittest.py
index ad564f0..598fb80 100755
--- a/site_utils/gs_offloader_unittest.py
+++ b/site_utils/gs_offloader_unittest.py
@@ -927,12 +927,12 @@
# A skylab path
- path = ('/swarming-458e3a3a7fc6f210/autoserv_test/'
+ path = ('/swarming-458e3a3a7fc6f210/1/autoserv_test/'
'cheets_CTS.android.dpi/results/cts-results/'
'2016.04.28_01.41.44')
job_id, package, timestamp = \
gs_offloader._parse_cts_job_results_file_path(path)
- self.assertEqual('swarming-458e3a3a7fc6f210', job_id)
+ self.assertEqual('swarming-458e3a3a7fc6f210-1', job_id)
self.assertEqual('cheets_CTS.android.dpi', package)
self.assertEqual('2016.04.28_01.41.44', timestamp)