Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

test/javaTests: rename ser to s

Browse source 
Codespell thinks it is a misspelled "set", and it looks that way.

Use s.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2022-03-30 18:10:38 -07:00 • committed by Andrei Vagin
parent 777ad1966d
commit bd3a21e0b1
5 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
View file

@ -55,14 +55,14 @@ class SocketsConnectServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
}
ServerSocket ser = new ServerSocket(port);
ServerSocket s = new ServerSocket(port);
logger.log(Level.INFO, "Server will be listening on Port: " + port);
/*
* Timeout after 7 sec if client does not connect
*/
try {
ser.setSoTimeout(7 * 1000);
s.setSoTimeout(7 * 1000);
} catch (SocketException e) {
logger.log(Level.SEVERE, "Cannot set timeout!");
@ -73,14 +73,14 @@ class SocketsConnectServer {
try {
if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
ser.close();
s.close();
System.exit(1);
}
/*
* Checkpoint when server is listening for connections, and no client has connected to the server.
*/
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
socket = ser.accept();
socket = s.accept();
SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
} catch (Exception e) {
@ -88,13 +88,13 @@ class SocketsConnectServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
}
if (!ser.isBound()) {
if (!s.isBound()) {
logger.log(Level.SEVERE, "Server is not bound to a port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);
}
if (ser.getLocalPort() != port) {
if (s.getLocalPort() != port) {
logger.log(Level.SEVERE, "Server is not listening on correct port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);

6
test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
View file

@ -50,14 +50,14 @@ class SocketsDataServer {
System.exit(1);
}
ServerSocket ser = new ServerSocket(port);
ServerSocket s = new ServerSocket(port);
logger.log(Level.INFO, "Server will be listening on Port " + port);
/*
* Wait for 7 seconds for client to connect, else throw a timeout exception
*/
try {
ser.setSoTimeout(7 * 1000);
s.setSoTimeout(7 * 1000);
} catch (SocketException e) {
logger.log(Level.SEVERE, "cannot set timeout");
@ -70,7 +70,7 @@ class SocketsDataServer {
* begin listening for connections.
*/
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
socket = ser.accept();
socket = s.accept();
BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
PrintStream outstream = new PrintStream(socket.getOutputStream());

12
test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
View file

@ -58,13 +58,13 @@ class SocketsListenServer {
}
logger.log(Level.INFO, "Server will be listening on Port " + port);
ServerSocket ser = new ServerSocket(port);
ServerSocket s = new ServerSocket(port);
/*
* Server has bound to a port but is not listening yet!
*/
logger.log(Level.INFO, "Going to checkpoint");
if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
ser.close();
s.close();
System.exit(1);
}
/*
@ -73,13 +73,13 @@ class SocketsListenServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
if (!ser.isBound()) {
if (!s.isBound()) {
logger.log(Level.SEVERE, "Server is not bound to a port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);
}
if (ser.getLocalPort() != port) {
if (s.getLocalPort() != port) {
logger.log(Level.SEVERE, "SServer is not listening on correct port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);
@ -88,7 +88,7 @@ class SocketsListenServer {
* Timeout after 5 sec if client does not connect
*/
try {
ser.setSoTimeout(5 * 1000);
s.setSoTimeout(5 * 1000);
} catch (SocketException e) {
logger.log(Level.SEVERE, "cannot set timeout");
@ -102,7 +102,7 @@ class SocketsListenServer {
* will begin listening for connections.
*/
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
socket = ser.accept();
socket = s.accept();
} catch (Exception e) {
logger.log(Level.SEVERE, "Timed out while waiting for client to connect\n" + e);

6
test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
View file

@ -62,7 +62,7 @@ class SocketsMultipleServer {
socketMappedBuffer.putChar(7, Helper.STATE_INIT);
socketMappedBuffer.putChar(9, Helper.STATE_INIT);
ServerSocket ser = new ServerSocket(port);
ServerSocket s = new ServerSocket(port);
logger.log(Level.INFO, "Server will be listening on Port " + port);
Socket[] sockets = new Socket[4];
@ -73,8 +73,8 @@ class SocketsMultipleServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
for (int i = 1; i <= 4; i++) {
sockets[i - 1] = ser.accept();
ServerThread serverThread = new ServerThread(sockets[i - 1], "ser-socket " + i, 2 * i + 1, logger, socketMappedBuffer);
sockets[i - 1] = s.accept();
ServerThread serverThread = new ServerThread(sockets[i - 1], "s-socket " + i, 2 * i + 1, logger, socketMappedBuffer);
serverThread.start();
if (i == 3) {
logger.log(Level.INFO, "Connected to client: 3");

10
test/javaTests/src/org/criu/java/tests/SocketsServer.java
View file

@ -54,18 +54,18 @@ class SocketsServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
}
ServerSocket ser = new ServerSocket(port);
ServerSocket s = new ServerSocket(port);
logger.log(Level.INFO, "Server will be listening on Port " + port);
/*
* Timeout after 5 second if client does not connect
*/
ser.setSoTimeout(5 * 1000);
s.setSoTimeout(5 * 1000);
logger.log(Level.INFO, "Waiting for client to connect");
Socket socket = null;
try {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
socket = ser.accept();
socket = s.accept();
} catch (Exception e) {
logger.log(Level.SEVERE, "Timed out while waiting for client to connect");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@ -90,13 +90,13 @@ class SocketsServer {
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
if (!ser.isBound()) {
if (!s.isBound()) {
logger.log(Level.SEVERE, "Server is not bound to a port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);
}
if (ser.getLocalPort() != port) {
if (s.getLocalPort() != port) {
logger.log(Level.SEVERE, "Server is not listening on correct port");
socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
System.exit(1);