Fossil SCM
minor cleanups in some of the ajax test code.
Commit
7716c9852063a7d935b998e500127f0e6fbb07be
Parent
4272d03e324ea05…
1 file changed
+5
-3
+5
-3
| --- ajax/i-test/rhino-test.js | ||
| +++ ajax/i-test/rhino-test.js | ||
| @@ -199,22 +199,24 @@ | ||
| 199 | 199 | var outs = p.getOutputStream(); |
| 200 | 200 | var osr = new java.io.OutputStreamWriter(outs); |
| 201 | 201 | var osb = new java.io.BufferedWriter(osr); |
| 202 | 202 | var json = JSON.stringify(req); |
| 203 | 203 | osb.write(json,0, json.length); |
| 204 | - //osb.flush(); | |
| 205 | 204 | osb.close(); |
| 205 | + req = json = outs = osr = osb = undefined; | |
| 206 | 206 | var ins = p.getInputStream(); |
| 207 | 207 | var isr = new java.io.InputStreamReader(ins); |
| 208 | 208 | var br = new java.io.BufferedReader(isr); |
| 209 | 209 | var line; |
| 210 | 210 | |
| 211 | 211 | while( null !== (line=br.readLine())){ |
| 212 | 212 | print(line); |
| 213 | 213 | } |
| 214 | - //outs.close(); | |
| 214 | + br.close(); | |
| 215 | + isr.close(); | |
| 215 | 216 | ins.close(); |
| 217 | + p.waitFor(); | |
| 216 | 218 | } |
| 217 | 219 | testExternalProcess.description = 'Run fossil as external process.'; |
| 218 | 220 | |
| 219 | 221 | function testExternalProcessHandler(){ |
| 220 | 222 | var aj = TestApp.fossil.ajaj; |
| @@ -238,11 +240,11 @@ | ||
| 238 | 240 | testHAI, |
| 239 | 241 | testIAmNobody, |
| 240 | 242 | testAnonymousLogin, |
| 241 | 243 | testAnonWiki, |
| 242 | 244 | testAnonLogout, |
| 243 | - //testExternalProcess, | |
| 245 | + testExternalProcess, | |
| 244 | 246 | testExternalProcessHandler |
| 245 | 247 | ]; |
| 246 | 248 | var i, f; |
| 247 | 249 | for( i = 0; i < testList.length; ++i ){ |
| 248 | 250 | f = testList[i]; |
| 249 | 251 |
| --- ajax/i-test/rhino-test.js | |
| +++ ajax/i-test/rhino-test.js | |
| @@ -199,22 +199,24 @@ | |
| 199 | var outs = p.getOutputStream(); |
| 200 | var osr = new java.io.OutputStreamWriter(outs); |
| 201 | var osb = new java.io.BufferedWriter(osr); |
| 202 | var json = JSON.stringify(req); |
| 203 | osb.write(json,0, json.length); |
| 204 | //osb.flush(); |
| 205 | osb.close(); |
| 206 | var ins = p.getInputStream(); |
| 207 | var isr = new java.io.InputStreamReader(ins); |
| 208 | var br = new java.io.BufferedReader(isr); |
| 209 | var line; |
| 210 | |
| 211 | while( null !== (line=br.readLine())){ |
| 212 | print(line); |
| 213 | } |
| 214 | //outs.close(); |
| 215 | ins.close(); |
| 216 | } |
| 217 | testExternalProcess.description = 'Run fossil as external process.'; |
| 218 | |
| 219 | function testExternalProcessHandler(){ |
| 220 | var aj = TestApp.fossil.ajaj; |
| @@ -238,11 +240,11 @@ | |
| 238 | testHAI, |
| 239 | testIAmNobody, |
| 240 | testAnonymousLogin, |
| 241 | testAnonWiki, |
| 242 | testAnonLogout, |
| 243 | //testExternalProcess, |
| 244 | testExternalProcessHandler |
| 245 | ]; |
| 246 | var i, f; |
| 247 | for( i = 0; i < testList.length; ++i ){ |
| 248 | f = testList[i]; |
| 249 |
| --- ajax/i-test/rhino-test.js | |
| +++ ajax/i-test/rhino-test.js | |
| @@ -199,22 +199,24 @@ | |
| 199 | var outs = p.getOutputStream(); |
| 200 | var osr = new java.io.OutputStreamWriter(outs); |
| 201 | var osb = new java.io.BufferedWriter(osr); |
| 202 | var json = JSON.stringify(req); |
| 203 | osb.write(json,0, json.length); |
| 204 | osb.close(); |
| 205 | req = json = outs = osr = osb = undefined; |
| 206 | var ins = p.getInputStream(); |
| 207 | var isr = new java.io.InputStreamReader(ins); |
| 208 | var br = new java.io.BufferedReader(isr); |
| 209 | var line; |
| 210 | |
| 211 | while( null !== (line=br.readLine())){ |
| 212 | print(line); |
| 213 | } |
| 214 | br.close(); |
| 215 | isr.close(); |
| 216 | ins.close(); |
| 217 | p.waitFor(); |
| 218 | } |
| 219 | testExternalProcess.description = 'Run fossil as external process.'; |
| 220 | |
| 221 | function testExternalProcessHandler(){ |
| 222 | var aj = TestApp.fossil.ajaj; |
| @@ -238,11 +240,11 @@ | |
| 240 | testHAI, |
| 241 | testIAmNobody, |
| 242 | testAnonymousLogin, |
| 243 | testAnonWiki, |
| 244 | testAnonLogout, |
| 245 | testExternalProcess, |
| 246 | testExternalProcessHandler |
| 247 | ]; |
| 248 | var i, f; |
| 249 | for( i = 0; i < testList.length; ++i ){ |
| 250 | f = testList[i]; |
| 251 |