diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-03-20 15:30:17 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-03-25 13:40:28 +0100 |
| commit | 7150a5f7027725b5eed9c723c6224c8b3d5307dd (patch) | |
| tree | e89e9be3d6155b1f47fd5c6d76c5b6c78ae4ef5b /controlloop/common/model-impl/so/pom.xml | |
| parent | c9f47efdffe00fc5f823b1c982e6b12d92f90276 (diff) | |
Add timeout to SO to wait for success
The timeout implementation assumes that a finished request is a HTTP-200
together with either a request state of COMPLETE or FAILED in the embedded
request in the response in the JSON. This is the same as what is done earlier
in this class and in, for example, VFC.
Unit test for timeout has also been added.
Change-Id: I637dbecb8d230b8060f7ced76d92d11ec482503e
Issue-ID: POLICY-448
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'controlloop/common/model-impl/so/pom.xml')
| -rw-r--r-- | controlloop/common/model-impl/so/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/controlloop/common/model-impl/so/pom.xml b/controlloop/common/model-impl/so/pom.xml index a026236a6..cc31464a7 100644 --- a/controlloop/common/model-impl/so/pom.xml +++ b/controlloop/common/model-impl/so/pom.xml @@ -60,9 +60,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.13.0</version> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-grizzly2-http</artifactId> + <version>2.25.1</version> <scope>test</scope> </dependency> </dependencies> |