changeset 117:080660b2ce7d

Merged
author Sascha Wilde <wilde@intevation.de>
date Fri, 21 Mar 2014 17:46:09 +0100 (2014-03-21)
parents c602d8cfa619 (current diff) 5ed770c41a73 (diff)
children d6a74464430b
files
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ui/tests/cinstprocesstest.cpp	Fri Mar 21 17:42:00 2014 +0100
+++ b/ui/tests/cinstprocesstest.cpp	Fri Mar 21 17:46:09 2014 +0100
@@ -77,11 +77,9 @@
         }
         retval = installerProcess->write(garbage, 1030);
         bytesWritten += retval;
-    } while (retval != -1 && bytesWritten < 100 *1024 *1024 );
+    } while (retval != -1 && bytesWritten < 15 *1024 *1024 );
 
-    QVERIFY (bytesWritten  < 100 *1024 *1024);
-
-    finishVerify(installerProcess, ERR_TOO_MUCH_INPUT);
+    finishVerify(installerProcess, ERR_INVALID_INPUT);
 }
 
 void CinstProcessTest::testNoInput() {
@@ -109,12 +107,12 @@
     QProcess* installerProcess = startCinstProcess();
     QVERIFY(installerProcess->state() == QProcess::Running);
 
-    /* foobar as instruction */
+    /* I: as instruction */
     installerProcess->write("-----BEGIN CERTIFICATE LIST-----\r\n");
     installerProcess->write(validList.rawData().toLatin1());
     installerProcess->write("-----END CERTIFICATE LIST-----\r\n");
 
-    installerProcess->write("foobar");
+    installerProcess->write("I:ABCDEF");
 
     finishVerify(installerProcess, ERR_INVALID_INSTRUCTIONS);
 }

http://wald.intevation.org/projects/trustbridge/