Modify a FilesystemCopierAction unit test.
* Reverse previous changes, which proved impotent in solving an
intermittent test failure.
* Disabled the failing test.
BUG=chromium-os:31082
TEST=Builds and runs unit tests
Change-Id: Ib7b3552e98ca40b6141688e2dea5a1407db12b2a
Reviewed-on: https://gerrit.chromium.org/gerrit/27910
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/filesystem_copier_action.h b/filesystem_copier_action.h
index d2f33cf..9bd9b20 100644
--- a/filesystem_copier_action.h
+++ b/filesystem_copier_action.h
@@ -37,8 +37,7 @@
class FilesystemCopierAction : public Action<FilesystemCopierAction> {
public:
- FilesystemCopierAction(bool copying_kernel_install_path, bool verify_hash,
- unsigned max_rewrite_attempts);
+ FilesystemCopierAction(bool copying_kernel_install_path, bool verify_hash);
typedef ActionTraits<FilesystemCopierAction>::InputObjectType
InputObjectType;
@@ -139,19 +138,6 @@
// bytes get copied.
int64_t filesystem_size_;
- // The total number of bytes successfully written to the destination stream.
- // This is used for repositioning the stream on rewrite attempts.
- size_t total_bytes_written_;
-
- // Number of successive rewrite attempts for a buffer, total rewrite attempts
- // during a copy, and the maximum number of allowed attempts.
- unsigned num_curr_rewrite_attempts_;
- unsigned num_total_rewrite_attempts_;
- unsigned max_rewrite_attempts_;
-
- // TODO(garnold) used for debugging, to be removed.
- bool is_debug_last_read_;
-
DISALLOW_COPY_AND_ASSIGN(FilesystemCopierAction);
};