projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7593: Add version hint to arvados-python-client. Add get_uploaded() and
[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 a626d9be9b67aff2369d6e4399f90f81b806d99b..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,17
+53,17
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH_
2,
- Block2: T
EST_BLOCK_
2,
+ Locator2: T
estHash
2,
+ Block2: T
estBlock
2,
CreateData: true,
CreateData: true,
- DeleteLocator: T
EST_HASH
, // first locator
+ DeleteLocator: T
estHash
, // first locator
ExpectLocator1: false,
ExpectLocator2: true,
ExpectLocator1: false,
ExpectLocator2: true,
@@
-75,17
+75,17
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH_
2,
- Block2: T
EST_BLOCK_
2,
+ Locator2: T
estHash
2,
+ Block2: T
estBlock
2,
CreateData: true,
CreateData: true,
- DeleteLocator: T
EST_HASH_
2, // locator 2
+ DeleteLocator: T
estHash
2, // locator 2
ExpectLocator1: true,
ExpectLocator2: false,
ExpectLocator1: true,
ExpectLocator2: false,
@@
-97,17
+97,17
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH
,
- Block2: T
EST_BLOCK
,
+ Locator2: T
estHash
,
+ Block2: T
estBlock
,
CreateData: true,
CreateData: true,
- DeleteLocator: T
EST_HASH
,
+ DeleteLocator: T
estHash
,
ExpectLocator1: false,
ExpectLocator2: false,
ExpectLocator1: false,
ExpectLocator2: false,
@@
-119,18
+119,18
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH
,
- Block2: T
EST_BLOCK
,
+ Locator2: T
estHash
,
+ Block2: T
estBlock
,
CreateData: true,
DifferentMtimes: true,
CreateData: true,
DifferentMtimes: true,
- DeleteLocator: T
EST_HASH
,
+ DeleteLocator: T
estHash
,
ExpectLocator1: true,
ExpectLocator2: false,
ExpectLocator1: true,
ExpectLocator2: false,
@@
-143,18
+143,18
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH_
2,
- Block2: T
EST_BLOCK_
2,
+ Locator2: T
estHash
2,
+ Block2: T
estBlock
2,
CreateData: true,
CreateInVolume1: true,
CreateData: true,
CreateInVolume1: true,
- DeleteLocator: T
EST_HASH
, // locator 1
+ DeleteLocator: T
estHash
, // locator 1
ExpectLocator1: false,
ExpectLocator2: true,
ExpectLocator1: false,
ExpectLocator2: true,
@@
-166,20
+166,20
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH_
2,
- Block2: T
EST_BLOCK_
2,
+ Locator2: T
estHash
2,
+ Block2: T
estBlock
2,
CreateData: true,
CreateInVolume1: true,
UseTrashLifeTime: true,
CreateData: true,
CreateInVolume1: true,
UseTrashLifeTime: true,
- DeleteLocator: T
EST_HASH
, // locator 1
+ DeleteLocator: T
estHash
, // locator 1
// Since trash life time is in effect, block won't be deleted.
ExpectLocator1: true,
// Since trash life time is in effect, block won't be deleted.
ExpectLocator1: true,
@@
-188,21
+188,21
@@
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{
testData := TrashWorkerTestData{
- Locator1: T
EST_HASH
,
- Block1: T
EST_BLOCK
,
+ Locator1: T
estHash
,
+ Block1: T
estBlock
,
- Locator2: T
EST_HASH
,
- Block2: T
EST_BLOCK
,
+ Locator2: T
estHash
,
+ Block2: T
estBlock
,
CreateData: true,
CreateData: true,
- DeleteLocator: T
EST_HASH
,
+ DeleteLocator: T
estHash
,
ExpectLocator1: true,
ExpectLocator2: true,
ExpectLocator1: true,
ExpectLocator2: true,
@@
-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{