update_engine: fix lint issues in DeltaPerformer tests
Two lint issues:
* nondeterminism caused by rand(), replaced with rand_r()
[runtime/threadsafe_fn]
* two spaces between code and comments [whitespace/comments]
The latter was resolved by moving out the comment and what it was
attached to.
BUG=None
TEST=unit tests
Change-Id: Ie29237c578e34c9f5f22fca984c5e9bf5a54b1a7
Reviewed-on: https://chromium-review.googlesource.com/882559
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/payload_consumer/delta_performer_unittest.cc b/payload_consumer/delta_performer_unittest.cc
index 4af21e8..aa53347 100644
--- a/payload_consumer/delta_performer_unittest.cc
+++ b/payload_consumer/delta_performer_unittest.cc
@@ -18,6 +18,7 @@
#include <endian.h>
#include <inttypes.h>
+#include <time.h>
#include <string>
#include <vector>
@@ -720,16 +721,17 @@
}
TEST_F(DeltaPerformerTest, BrilloMetadataSignatureSizeTest) {
+ unsigned int seed = time(nullptr);
EXPECT_TRUE(performer_.Write(kDeltaMagic, sizeof(kDeltaMagic)));
uint64_t major_version = htobe64(kBrilloMajorPayloadVersion);
EXPECT_TRUE(performer_.Write(&major_version, 8));
- uint64_t manifest_size = rand() % 256;
+ uint64_t manifest_size = rand_r(&seed) % 256;
uint64_t manifest_size_be = htobe64(manifest_size);
EXPECT_TRUE(performer_.Write(&manifest_size_be, 8));
- uint32_t metadata_signature_size = rand() % 256;
+ uint32_t metadata_signature_size = rand_r(&seed) % 256;
uint32_t metadata_signature_size_be = htobe32(metadata_signature_size);
EXPECT_TRUE(performer_.Write(&metadata_signature_size_be, 4));
@@ -839,7 +841,10 @@
// Non-official build, non-existing public-key, key in response -> true
fake_hardware_.SetIsOfficialBuild(false);
performer_.public_key_path_ = non_existing_file;
- install_plan_.public_key_rsa = "VGVzdAo="; // result of 'echo "Test" | base64'
+ // This is the result of 'echo "Test" | base64' and is not meant to be a
+ // valid public key, but it is valid base-64.
+ constexpr char kBase64TestKey[] = "VGVzdAo=";
+ install_plan_.public_key_rsa = kBase64TestKey;
EXPECT_TRUE(performer_.GetPublicKeyFromResponse(&key_path));
EXPECT_FALSE(key_path.empty());
EXPECT_EQ(unlink(key_path.value().c_str()), 0);
@@ -850,7 +855,7 @@
// Non-official build, existing public-key, key in response -> false
fake_hardware_.SetIsOfficialBuild(false);
performer_.public_key_path_ = existing_file;
- install_plan_.public_key_rsa = "VGVzdAo="; // result of 'echo "Test" | base64'
+ install_plan_.public_key_rsa = kBase64TestKey;
EXPECT_FALSE(performer_.GetPublicKeyFromResponse(&key_path));
// Same with official build -> false
fake_hardware_.SetIsOfficialBuild(true);