summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorNils Schwabe2014-04-22 16:56:07 +0200
committerNils Schwabe2014-04-22 16:56:07 +0200
commit01e662bdfff823c4f5f0b6a270807fd0a3d2825f (patch)
treedaf063bc84c06781768794c17cc76f08decaa9c3 /src/test
parentAdded test case for sha512crypt, removed try/catch blocks from other tests, s... (diff)
downloadmasterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.gz
masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.xz
masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.zip
added a method to imageserver so that finshed uploads can be signaled
did some todos from simon moved FtpCredentials creation to MasterFtpServer.java moved some options to to config file
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/openslx/imagemaster/AppTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/java/org/openslx/imagemaster/AppTest.java b/src/test/java/org/openslx/imagemaster/AppTest.java
index 120bd9e..a491242 100644
--- a/src/test/java/org/openslx/imagemaster/AppTest.java
+++ b/src/test/java/org/openslx/imagemaster/AppTest.java
@@ -122,7 +122,7 @@ public class AppTest
System.out.println("Created imageData");
- FtpCredentials ftpCredentials = client.submitImage(imageData, data);
+ FtpCredentials ftpCredentials = client.submitImage(data.sessionId, imageData);
System.out.println("Got FTP credentials. User: " + ftpCredentials.username + ", password: " + ftpCredentials.password);
FTPClient FtpClient = new FTPClient();