Fix merge problems

This commit is contained in:
TeoV
2020-02-28 10:09:13 +02:00
committed by Dan Christian Bogos
parent 87095fa53b
commit d6447eb4db

View File

@@ -154,7 +154,7 @@ func TestProcessRequest(t *testing.T) {
return nil
}
*prply = sessions.V1AuthorizeReply{
MaxUsage: utils.DurationPointer(time.Duration(-1)),
MaxUsage: time.Duration(-1),
}
return nil
},
@@ -218,7 +218,7 @@ func TestProcessRequest(t *testing.T) {
},
},
},
MaxUsage: utils.DurationPointer(10 * time.Second),
MaxUsage: 10 * time.Second,
}
return nil
},
@@ -282,7 +282,7 @@ func TestProcessRequest(t *testing.T) {
},
},
},
MaxUsage: utils.DurationPointer(10 * time.Second),
MaxUsage: 10 * time.Second,
}
return nil
},
@@ -423,7 +423,7 @@ func TestProcessRequest(t *testing.T) {
},
},
},
MaxUsage: utils.DurationPointer(10 * time.Second),
MaxUsage: 10 * time.Second,
}
return nil
},