From afe81a8b3b756f94d5a7533fe9358d833c010ed4 Mon Sep 17 00:00:00 2001 From: Ziming Zhang Date: Fri, 20 Sep 2019 15:57:45 +0800 Subject: [PATCH 1/2] adjust wait job timeout Change-Id: I8f32f814158d4a7418c39edb7a781879db17a4d7 Signed-off-by: Ziming Zhang --- tests/apitests/python/test_retention.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/apitests/python/test_retention.py b/tests/apitests/python/test_retention.py index 06584af23..eedb5a538 100644 --- a/tests/apitests/python/test_retention.py +++ b/tests/apitests/python/test_retention.py @@ -70,7 +70,7 @@ class TestProjects(unittest.TestCase): # Dry run self.retention.trigger_retention_policy(retention_id, dry_run=True, **TestProjects.USER_RA_CLIENT) - time.sleep(2) + time.sleep(10) resp=self.retention.get_retention_executions(retention_id, **TestProjects.USER_RA_CLIENT) self.assertTrue(len(resp)>0) execution=resp[0] From f6ac2687fa2279b0fb3397e12bd9fc562fc78404 Mon Sep 17 00:00:00 2001 From: Ziming Zhang Date: Fri, 20 Sep 2019 18:32:01 +0800 Subject: [PATCH 2/2] fix dayspl/daysps test Signed-off-by: Ziming Zhang Change-Id: I3c654e305f774c2329109888f68e708efeca721e --- .../policy/rule/dayspl/evaluator_test.go | 36 +++++++++---------- .../policy/rule/daysps/evaluator_test.go | 34 +++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/pkg/retention/policy/rule/dayspl/evaluator_test.go b/src/pkg/retention/policy/rule/dayspl/evaluator_test.go index 1d4c19282..79893b2d2 100644 --- a/src/pkg/retention/policy/rule/dayspl/evaluator_test.go +++ b/src/pkg/retention/policy/rule/dayspl/evaluator_test.go @@ -17,12 +17,12 @@ package dayspl import ( "errors" "fmt" + "github.com/stretchr/testify/assert" "testing" "time" "github.com/goharbor/harbor/src/pkg/art" "github.com/goharbor/harbor/src/pkg/retention/policy/rule" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) @@ -55,14 +55,14 @@ func (e *EvaluatorTestSuite) TestNew() { func (e *EvaluatorTestSuite) TestProcess() { now := time.Now().UTC() data := []*art.Candidate{ - {PulledTime: daysAgo(now, 1)}, - {PulledTime: daysAgo(now, 2)}, - {PulledTime: daysAgo(now, 3)}, - {PulledTime: daysAgo(now, 4)}, - {PulledTime: daysAgo(now, 5)}, - {PulledTime: daysAgo(now, 10)}, - {PulledTime: daysAgo(now, 20)}, - {PulledTime: daysAgo(now, 30)}, + {PulledTime: daysAgo(now, 1, time.Hour)}, + {PulledTime: daysAgo(now, 2, time.Hour)}, + {PulledTime: daysAgo(now, 3, time.Hour)}, + {PulledTime: daysAgo(now, 4, time.Hour)}, + {PulledTime: daysAgo(now, 5, time.Hour)}, + {PulledTime: daysAgo(now, 10, time.Hour)}, + {PulledTime: daysAgo(now, 20, time.Hour)}, + {PulledTime: daysAgo(now, 30, time.Hour)}, } tests := []struct { @@ -71,13 +71,13 @@ func (e *EvaluatorTestSuite) TestProcess() { minPullTime int64 }{ {n: 0, expected: 0, minPullTime: 0}, - {n: 1, expected: 1, minPullTime: daysAgo(now, 1)}, - {n: 2, expected: 2, minPullTime: daysAgo(now, 2)}, - {n: 3, expected: 3, minPullTime: daysAgo(now, 3)}, - {n: 4, expected: 4, minPullTime: daysAgo(now, 4)}, - {n: 5, expected: 5, minPullTime: daysAgo(now, 5)}, - {n: 15, expected: 6, minPullTime: daysAgo(now, 10)}, - {n: 90, expected: 8, minPullTime: daysAgo(now, 30)}, + {n: 1, expected: 1, minPullTime: daysAgo(now, 1, 0)}, + {n: 2, expected: 2, minPullTime: daysAgo(now, 2, 0)}, + {n: 3, expected: 3, minPullTime: daysAgo(now, 3, 0)}, + {n: 4, expected: 4, minPullTime: daysAgo(now, 4, 0)}, + {n: 5, expected: 5, minPullTime: daysAgo(now, 5, 0)}, + {n: 15, expected: 6, minPullTime: daysAgo(now, 10, 0)}, + {n: 90, expected: 8, minPullTime: daysAgo(now, 30, 0)}, } for _, tt := range tests { @@ -120,6 +120,6 @@ func TestEvaluatorSuite(t *testing.T) { suite.Run(t, &EvaluatorTestSuite{}) } -func daysAgo(from time.Time, n int) int64 { - return from.Add(time.Duration(-1*24*n) * time.Hour).Unix() +func daysAgo(from time.Time, n int, offset time.Duration) int64 { + return from.Add(time.Duration(-1*24*n)*time.Hour + offset).Unix() } diff --git a/src/pkg/retention/policy/rule/daysps/evaluator_test.go b/src/pkg/retention/policy/rule/daysps/evaluator_test.go index 7d4e6995c..4a7877f1f 100644 --- a/src/pkg/retention/policy/rule/daysps/evaluator_test.go +++ b/src/pkg/retention/policy/rule/daysps/evaluator_test.go @@ -55,14 +55,14 @@ func (e *EvaluatorTestSuite) TestNew() { func (e *EvaluatorTestSuite) TestProcess() { now := time.Now().UTC() data := []*art.Candidate{ - {PushedTime: daysAgo(now, 1)}, - {PushedTime: daysAgo(now, 2)}, - {PushedTime: daysAgo(now, 3)}, - {PushedTime: daysAgo(now, 4)}, - {PushedTime: daysAgo(now, 5)}, - {PushedTime: daysAgo(now, 10)}, - {PushedTime: daysAgo(now, 20)}, - {PushedTime: daysAgo(now, 30)}, + {PushedTime: daysAgo(now, 1, time.Hour)}, + {PushedTime: daysAgo(now, 2, time.Hour)}, + {PushedTime: daysAgo(now, 3, time.Hour)}, + {PushedTime: daysAgo(now, 4, time.Hour)}, + {PushedTime: daysAgo(now, 5, time.Hour)}, + {PushedTime: daysAgo(now, 10, time.Hour)}, + {PushedTime: daysAgo(now, 20, time.Hour)}, + {PushedTime: daysAgo(now, 30, time.Hour)}, } tests := []struct { @@ -71,13 +71,13 @@ func (e *EvaluatorTestSuite) TestProcess() { minPushTime int64 }{ {n: 0, expected: 0, minPushTime: 0}, - {n: 1, expected: 1, minPushTime: daysAgo(now, 1)}, - {n: 2, expected: 2, minPushTime: daysAgo(now, 2)}, - {n: 3, expected: 3, minPushTime: daysAgo(now, 3)}, - {n: 4, expected: 4, minPushTime: daysAgo(now, 4)}, - {n: 5, expected: 5, minPushTime: daysAgo(now, 5)}, - {n: 15, expected: 6, minPushTime: daysAgo(now, 10)}, - {n: 90, expected: 8, minPushTime: daysAgo(now, 30)}, + {n: 1, expected: 1, minPushTime: daysAgo(now, 1, 0)}, + {n: 2, expected: 2, minPushTime: daysAgo(now, 2, 0)}, + {n: 3, expected: 3, minPushTime: daysAgo(now, 3, 0)}, + {n: 4, expected: 4, minPushTime: daysAgo(now, 4, 0)}, + {n: 5, expected: 5, minPushTime: daysAgo(now, 5, 0)}, + {n: 15, expected: 6, minPushTime: daysAgo(now, 10, 0)}, + {n: 90, expected: 8, minPushTime: daysAgo(now, 30, 0)}, } for _, tt := range tests { @@ -120,6 +120,6 @@ func TestEvaluatorSuite(t *testing.T) { suite.Run(t, &EvaluatorTestSuite{}) } -func daysAgo(from time.Time, n int) int64 { - return from.Add(time.Duration(-1*24*n) * time.Hour).Unix() +func daysAgo(from time.Time, n int, offset time.Duration) int64 { + return from.Add(time.Duration(-1*24*n)*time.Hour + offset).Unix() }