projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into wtsi-hgi-feature/arv-view
[arvados.git]
/
services
/
keepstore
/
trash_worker_test.go
diff --git
a/services/keepstore/trash_worker_test.go
b/services/keepstore/trash_worker_test.go
index 016ad28cf31943afb40a34846bbe4f11e64f3130..1d3063a9de10651cf675062a439403372d39f49f 100644
(file)
--- a/
services/keepstore/trash_worker_test.go
+++ b/
services/keepstore/trash_worker_test.go
@@
-31,7
+31,7
@@
type TrashWorkerTestData struct {
Expect no errors.
*/
func TestTrashWorkerIntegration_GetNonExistingLocator(t *testing.T) {
Expect no errors.
*/
func TestTrashWorkerIntegration_GetNonExistingLocator(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: "5d41402abc4b2a76b9719d911017c592",
Block1: []byte("hello"),
testData := TrashWorkerTestData{
Locator1: "5d41402abc4b2a76b9719d911017c592",
Block1: []byte("hello"),
@@
-53,7
+53,7
@@
func TestTrashWorkerIntegration_GetNonExistingLocator(t *testing.T) {
Expect the second locator in volume 2 to be unaffected.
*/
func TestTrashWorkerIntegration_LocatorInVolume1(t *testing.T) {
Expect the second locator in volume 2 to be unaffected.
*/
func TestTrashWorkerIntegration_LocatorInVolume1(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-75,7
+75,7
@@
func TestTrashWorkerIntegration_LocatorInVolume1(t *testing.T) {
Expect the first locator in volume 1 to be unaffected.
*/
func TestTrashWorkerIntegration_LocatorInVolume2(t *testing.T) {
Expect the first locator in volume 1 to be unaffected.
*/
func TestTrashWorkerIntegration_LocatorInVolume2(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-97,7
+97,7
@@
func TestTrashWorkerIntegration_LocatorInVolume2(t *testing.T) {
Expect locator to be deleted from both volumes.
*/
func TestTrashWorkerIntegration_LocatorInBothVolumes(t *testing.T) {
Expect locator to be deleted from both volumes.
*/
func TestTrashWorkerIntegration_LocatorInBothVolumes(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-119,7
+119,7
@@
func TestTrashWorkerIntegration_LocatorInBothVolumes(t *testing.T) {
Delete the second and expect the first to be still around.
*/
func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *testing.T) {
Delete the second and expect the first to be still around.
*/
func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-143,7
+143,7
@@
func TestTrashWorkerIntegration_MtimeMatchesForLocator1ButNotForLocator2(t *test
Expect the other unaffected.
*/
func TestTrashWorkerIntegration_TwoDifferentLocatorsInVolume1(t *testing.T) {
Expect the other unaffected.
*/
func TestTrashWorkerIntegration_TwoDifferentLocatorsInVolume1(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-166,7
+166,7
@@
func TestTrashWorkerIntegration_TwoDifferentLocatorsInVolume1(t *testing.T) {
will not be deleted becuase its Mtime is within the trash life time.
*/
func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime(t *testing.T) {
will not be deleted becuase its Mtime is within the trash life time.
*/
func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime(t *testing.T) {
- never
_d
elete = false
+ never
D
elete = false
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-188,11
+188,11
@@
func TestTrashWorkerIntegration_SameLocatorInTwoVolumesWithDefaultTrashLifeTime(
performTrashWorkerTest(testData, t)
}
performTrashWorkerTest(testData, t)
}
-/* Delete a block with matching mtime for locator in both volumes, but never
_d
elete is true,
+/* Delete a block with matching mtime for locator in both volumes, but never
D
elete is true,
so block won't be deleted.
*/
func TestTrashWorkerIntegration_NeverDelete(t *testing.T) {
so block won't be deleted.
*/
func TestTrashWorkerIntegration_NeverDelete(t *testing.T) {
- never
_d
elete = true
+ never
D
elete = true
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
testData := TrashWorkerTestData{
Locator1: TestHash,
Block1: TestBlock,
@@
-231,7
+231,7
@@
func performTrashWorkerTest(testData TrashWorkerTestData, t *testing.T) {
}
}
}
}
- oldBlockTime := time.Now().Add(-blob
_signature_ttl
- time.Minute)
+ oldBlockTime := time.Now().Add(-blob
SignatureTTL
- time.Minute)
// Create TrashRequest for the test
trashRequest := TrashRequest{
// Create TrashRequest for the test
trashRequest := TrashRequest{