diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceGrid/admin/run.py | 173 | ||||
| -rw-r--r-- | cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json | 5 |
2 files changed, 94 insertions, 84 deletions
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py index 06637cd66d6..6261705a011 100755 --- a/cpp/test/IceGrid/admin/run.py +++ b/cpp/test/IceGrid/admin/run.py @@ -112,90 +112,95 @@ args = ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010"' + \ ' --IceGridAdmin.Username=demo' + \ ' --IceGridAdmin.Password=dummy' admin = TestUtil.startClient(icegridadmin, args, None, None, False) -admin.expect('>>> ') -admin.sendline('application add application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) -admin.expect('>>> ') -admin.sendline('application list') -admin.expect('Test') -admin.sendline('application describe Test') -admin.expect('application `Test\'') -admin.expect('\{.*\}') -admin.expect('>>> ') -admin.sendline('application diff application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) -admin.expect('application `Test\'\n\{.*\}') -admin.expect('>>> ') -admin.sendline('application update application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) -admin.expect('>>> ') -admin.sendline('application patch Test') -admin.expect('>>> ') -admin.sendline('server list') -admin.expect('server') -admin.expect('>>> ') -admin.sendline('server describe server') -admin.expect('server `server\'\n\{.*\}') -admin.expect('>>> ') -admin.sendline('server start server') -admin.expect('>>> ') -admin.sendline('server state server') -admin.expect('^active \(.*\)') -admin.expect('>>> ') -admin.sendline('server pid server') -admin.expect('[0-9]+') -admin.expect('>>> ') -admin.sendline('server properties server') -admin.expect('>>> ') -admin.sendline('server property server Ice.Admin.ServerId') -admin.expect("^server") -admin.expect('>>> ') -admin.sendline('server patch server') -admin.expect('>>> ') -admin.sendline('server disable server') -admin.expect('>>> ') -admin.sendline('server enable server') -admin.expect('>>> ') -admin.sendline('adapter list') -admin.expect('TestAdapter') -admin.expect('>>> ') -admin.sendline('adapter endpoints TestAdapter') -admin.expect(['tcp', 'ssl']) -admin.expect('>>> ') -admin.sendline('object list') -admin.expect('test') -admin.expect('>>> ') -admin.sendline('object describe') -admin.expect('proxy = `.*\' type = `.*\'') -admin.expect('>>> ') -admin.sendline('object find Test') -admin.expect('test') -admin.expect('>>> ') -admin.sendline('server stop server') -admin.expect('>>> ') -admin.sendline('application remove Test') -admin.expect('>>> ') -admin.sendline('registry list') -admin.expect('Master') -admin.expect('>>> ') -admin.sendline('registry ping Master') -admin.expect('registry is up') -admin.expect('>>> ') -admin.sendline('registry describe Master') -admin.expect('registry `Master\'\n{.*}') -admin.expect('>>> ') -admin.sendline('node list') -admin.expect('localnode') -admin.expect('>>> ') -admin.sendline('node describe localnode') -admin.expect('node `localnode\'\n{.*}') -admin.expect('>>> ') -admin.sendline('node load localnode') -admin.expect('load average.*\n') -admin.expect('>>> ') -admin.sendline('node ping localnode') -admin.expect('node is up') -admin.expect('>>> ') -admin.sendline('exit') -admin.waitTestSuccess(timeout=120) -print("ok") +try: + admin.expect('>>> ') + admin.sendline('application add application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) + admin.expect('>>> ') + admin.sendline('application list') + admin.expect('Test') + admin.sendline('application describe Test') + admin.expect('application `Test\'') + admin.expect('\{.*\}') + admin.expect('>>> ') + admin.sendline('application diff application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) + admin.expect('application `Test\'\n\{.*\}') + admin.expect('>>> ') + admin.sendline('application update application.xml server.dir=%s' % TestUtil.getTestDirectory("server")) + admin.expect('>>> ') + admin.sendline('application patch Test') + admin.expect('>>> ') + admin.sendline('server list') + admin.expect('server') + admin.expect('>>> ') + admin.sendline('server describe server') + admin.expect('server `server\'\n\{.*\}') + admin.expect('>>> ') + admin.sendline('server start server') + admin.expect('>>> ') + admin.sendline('server state server') + admin.expect('^active \(.*\)') + admin.expect('>>> ') + admin.sendline('server pid server') + admin.expect('[0-9]+') + admin.expect('>>> ') + admin.sendline('server properties server') + admin.expect('>>> ') + admin.sendline('server property server Ice.Admin.ServerId') + admin.expect("^server") + admin.expect('>>> ') + admin.sendline('server patch server') + admin.expect('>>> ') + admin.sendline('server disable server') + admin.expect('>>> ') + admin.sendline('server enable server') + admin.expect('>>> ') + admin.sendline('adapter list') + admin.expect('TestAdapter') + admin.expect('>>> ') + admin.sendline('adapter endpoints TestAdapter') + admin.expect(['tcp', 'ssl']) + admin.expect('>>> ') + admin.sendline('object list') + admin.expect('test') + admin.expect('>>> ') + admin.sendline('object describe') + admin.expect('proxy = `.*\' type = `.*\'') + admin.expect('>>> ') + admin.sendline('object find Test') + admin.expect('test') + admin.expect('>>> ') + admin.sendline('server stop server') + admin.expect('>>> ') + admin.sendline('application remove Test') + admin.expect('>>> ') + admin.sendline('registry list') + admin.expect('Master') + admin.expect('>>> ') + admin.sendline('registry ping Master') + admin.expect('registry is up') + admin.expect('>>> ') + admin.sendline('registry describe Master') + admin.expect('registry `Master\'\n{.*}') + admin.expect('>>> ') + admin.sendline('node list') + admin.expect('localnode11') + admin.expect('>>> ') + admin.sendline('node describe localnode') + admin.expect('node `localnode\'\n{.*}') + admin.expect('>>> ') + admin.sendline('node load localnode') + admin.expect('load average.*\n') + admin.expect('>>> ') + admin.sendline('node ping localnode') + admin.expect('node is up') + admin.expect('>>> ') + admin.sendline('exit') + admin.waitTestSuccess(timeout=120) + print("ok") +except Exception as e: + admin.terminate() + print("error: " + str(e)) + print "failed!" # sys.stdout.write("testing icegridadmin... ") # sys.stdout.flush() diff --git a/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json index 93f4f1ff22c..71cb771b340 100644 --- a/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/cpp/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -71,6 +71,11 @@ "idiom" : "ipad", "filename" : "test_suite-76@2x.png", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { |