hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

fix #79 with testcase

Browse Source
This commit is contained in:
Peter Hormanns 2012-01-04 13:45:57 +00:00
parent 65966c0759
commit dffa8330ea
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hsarback/test/de/hsadmin/remote/SSLCertDomainTest.java
View File

@ -55,11 +55,15 @@ public class SSLCertDomainTest {
Object execute = client.execute(MODULE + ".add", params); Object execute = client.execute(MODULE + ".add", params);
assertTrue(execute instanceof Map<?, ?>); assertTrue(execute instanceof Map<?, ?>);
Thread.sleep(5000L); Thread.sleep(5000L);
CommandShell.execute("grep 'SSLCertificateChainFile' /var/local/lxc/hive/etc/apache2/sites-generated/aaa02.hostsharing.net"); String out = CommandShell.execute("( ls /var/local/lxc/hive/etc/apache2/sites-generated/aaa02.hostsharing.net >/dev/null 2>&1 " +
fail("ShellException expected"); " && grep 'SSLCertificateChainFile' /var/local/lxc/hive/etc/apache2/sites-generated/aaa02.hostsharing.net >/dev/null 2>&1 " +
" && echo Ok )" +
" || echo fail");
assertTrue(out.startsWith("Ok"));
} catch (XmlRpcException e) { } catch (XmlRpcException e) {
fail(e.getMessage()); fail(e.getMessage());
} catch (ShellException e) { } catch (ShellException e) {
fail(e.getMessage());
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(e.getMessage()); fail(e.getMessage());
} }
@ -82,11 +86,15 @@ public class SSLCertDomainTest {
Object execute = client.execute(MODULE + ".add", params); Object execute = client.execute(MODULE + ".add", params);
assertTrue(execute instanceof Map<?, ?>); assertTrue(execute instanceof Map<?, ?>);
Thread.sleep(5000L); Thread.sleep(5000L);
CommandShell.execute("grep 'SSLCertificate.*default' /var/local/lxc/hive/etc/apache2/sites-generated/aaa02.hostsharing.net"); String out = CommandShell.execute("( ls /var/local/lxc/hive/etc/apache2/sites-generated/aaa03.hostsharing.net >/dev/null 2>&1 " +
fail("ShellException expected"); " && grep 'SSLCertificate.*default' /var/local/lxc/hive/etc/apache2/sites-generated/aaa03.hostsharing.net >/dev/null 2>&1 " +
" && echo Ok )" +
" || echo fail");
assertTrue(out.startsWith("Ok"));
} catch (XmlRpcException e) { } catch (XmlRpcException e) {
fail(e.getMessage()); fail(e.getMessage());
} catch (ShellException e) { } catch (ShellException e) {
fail(e.getMessage());
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail(e.getMessage()); fail(e.getMessage());
} }