Skip to content

Commit

Permalink
Made a cleaner fix for the race condition
Browse files Browse the repository at this point in the history
  • Loading branch information
tkmcmaster committed Nov 6, 2024
1 parent 58a4933 commit 967bba2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions controller/test/ppaasencryptenvfile.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -517,11 +517,11 @@ describe("PpaasEncryptEnvironmentFile", () => {

it("Upload a test file force should upload unchanged files", (done: Mocha.Done) => {
const lastModified: number = Date.now();
testPpaasEncryptEnvironmentFileUpload.setLastModifiedLocal(lastModified);
testPpaasEncryptEnvironmentFileUpload.setLastModifiedLocal(lastModified - 1);
testPpaasEncryptEnvironmentFileUpload.upload(true).then(() => {
log("testPpaasEncryptEnvironmentFileDownload.upload(true) succeeded", LogLevel.DEBUG);
// If it's newer, but forced we should upload it and set the time to last modified
expect(testPpaasEncryptEnvironmentFileUpload.getLastModifiedLocal()).to.be.greaterThanOrEqual(lastModified);
expect(testPpaasEncryptEnvironmentFileUpload.getLastModifiedLocal()).to.be.greaterThan(lastModified);
done();
}).catch((error) => done(error));
});
Expand Down
4 changes: 2 additions & 2 deletions controller/test/ppaasencrypts3file.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,12 @@ describe("PpaasEncryptS3File", () => {
it("Upload a test file force should upload unchanged files", (done: Mocha.Done) => {
mockUploadObject();
const lastModified: number = Date.now();
testPpaasEncryptS3FileUpload.setLastModifiedLocal(lastModified);
testPpaasEncryptS3FileUpload.setLastModifiedLocal(lastModified - 1);
testPpaasEncryptS3FileUpload.upload(true).then(() => {
s3FileKey = testPpaasEncryptS3FileUpload.key;
log("testPpaasEncryptS3FileDownload.upload(true) succeeded", LogLevel.DEBUG);
// If it's newer, but forced we should upload it and set the time to last modified
expect(testPpaasEncryptS3FileUpload.getLastModifiedLocal()).to.be.greaterThanOrEqual(lastModified);
expect(testPpaasEncryptS3FileUpload.getLastModifiedLocal()).to.be.greaterThan(lastModified);
done();
}).catch((error) => done(error));
});
Expand Down

0 comments on commit 967bba2

Please sign in to comment.