Commit:    841917a5780c269767e09305ce0c915b415622a3
Author:    Allen Truong <v-alt...@microsoft.com>         Fri, 26 Apr 2019 
12:50:24 -0700
Committer: Anatol Belski <a...@php.net>      Mon, 29 Apr 2019 12:59:27 +0200
Parents:   f6754f318f108be42f9e6c1b0afd88ec63db01ec
Branches:  master

Link:       
http://git.php.net/?p=pftt2.git;a=commitdiff;h=841917a5780c269767e09305ce0c915b415622a3

Log:
Issue #21: Removed deprecated methods involving Thread.

Removed unused lines.

Bugs:
https://bugs.php.net/21

Changed paths:
  M  src/com/mostc/pftt/runner/AbstractLocalTestPackRunner.java


Diff:
diff --git a/src/com/mostc/pftt/runner/AbstractLocalTestPackRunner.java 
b/src/com/mostc/pftt/runner/AbstractLocalTestPackRunner.java
index 16c2b1b..48a66ba 100644
--- a/src/com/mostc/pftt/runner/AbstractLocalTestPackRunner.java
+++ b/src/com/mostc/pftt/runner/AbstractLocalTestPackRunner.java
@@ -766,9 +766,6 @@ public abstract class AbstractLocalTestPackRunner<A extends 
ActiveTestPack, S ex
                                thread_wsi = null;
                        }
                        // interrupt thread to make it stop
-                       try {
-                               TestPackThread.this.stop(new 
TestTimeoutException());
-                       } catch ( ThreadDeath ex ) {}
                        TestPackThread.this.interrupt();
                }
                
@@ -898,11 +895,6 @@ public abstract class AbstractLocalTestPackRunner<A 
extends ActiveTestPack, S ex
                                                                                
new_wsi = ((WebServerScenario)sapi_scenario).smgr.getWebServerInstance(cm, 
runner_fs, runner_host, scenario_set, build, 
                                                                                
                group_key.getPhpIni(),
                                                                                
                group_key.getEnv(),
-                                                                               
                this instanceof PhpUnitThread ? 
//src_test_pack.getSourceDirectory()//
-                                                                               
                                // yes definitely
-                                                                               
                                // @see HttpPhpUnitTestCaseRunner#execute
-                                                                               
                                ((PhpUnitThread)this).my_temp_dir // TODO temp 
phpunit 
-                                                                               
                                :
                                                                                
                active_test_pack.getStorageDirectory(), thread_wsi, 
debugger_attached, completed_tests);
                                                                                
if (new_wsi!=thread_wsi && thread_wsi!=null) {
                                                                                
        // be sure to close it or it will keep running (#getWebServerInstance 
doesn't close this)

Reply via email to