Skip to content

Commit 92831da

Browse files
author
innokenty
committed
fix quota reload test instability
1 parent f195dd3 commit 92831da

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

proxy/src/test/java/ru/qatools/gridrouter/QuotaReloadTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void tearDown() {
6161
}
6262

6363
@AfterClass
64-
public static void restoreQuotaFiles() {
64+
public static void restoreQuotaFiles() throws Exception {
6565
replacePortInQuotaFile(USER_1, HUB_PORT);
6666
deleteQuotaFile(USER_4);
6767
}

proxy/src/test/java/ru/qatools/gridrouter/utils/QuotaUtils.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package ru.qatools.gridrouter.utils;
22

3+
import org.apache.commons.io.FileUtils;
34
import org.apache.commons.lang3.SerializationUtils;
45
import ru.qatools.gridrouter.config.Browsers;
56

67
import javax.xml.bind.JAXB;
78
import java.io.File;
9+
import java.io.IOException;
10+
import java.io.StringWriter;
811

912
import static java.lang.ClassLoader.getSystemResource;
1013
import static ru.qatools.gridrouter.utils.GridRouterRule.USER_1;
@@ -20,11 +23,11 @@ private QuotaUtils() {
2023
public static final String QUOTA_FILE_PATTERN
2124
= getSystemResource("quota/" + USER_1 + ".xml").getPath().replace(USER_1, "%s");
2225

23-
public static void replacePortInQuotaFile(String user, int port) {
26+
public static void replacePortInQuotaFile(String user, int port) throws IOException {
2427
copyQuotaFile(user, user, port);
2528
}
2629

27-
public static void copyQuotaFile(String srcUser, String dstUser, int withHubPort) {
30+
public static void copyQuotaFile(String srcUser, String dstUser, int withHubPort) throws IOException {
2831
Browsers browsers = getQuotaFor(srcUser);
2932
setPort(browsers, withHubPort);
3033
writeQuotaFor(dstUser, browsers);
@@ -36,8 +39,11 @@ public static Browsers getQuotaFor(String user) {
3639
return SerializationUtils.clone(browsersOriginal);
3740
}
3841

39-
public static void writeQuotaFor(String user, Browsers browsers) {
40-
JAXB.marshal(browsers, getQuotaFile(user));
42+
public static void writeQuotaFor(String user, Browsers browsers) throws IOException {
43+
//workaround to write the whole file at once
44+
StringWriter xml = new StringWriter();
45+
JAXB.marshal(browsers, xml);
46+
FileUtils.write(getQuotaFile(user), xml.toString());
4147
}
4248

4349
public static File getQuotaFile(String user) {

0 commit comments

Comments
 (0)