首頁 探索 說明
登入
Troglodyne
/
selenium-client-perl
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Fix edge case with driver spawns

George S. Baugh 4 年之前
父節點
30eb1035a2
當前提交
e6bed624fe
共有 4 個文件被更改，包括 28 次插入 和 5 次删除
分割檢視 顯示文件統計
  1. 5 0
      Changes
  2. 3 3
      at/sanity.test
  3. 1 1
      dist.ini
  4. 19 1
      lib/Selenium/Client.pm

+ 5 - 0
Changes
查看文件 

@@ -1,5 +1,10 @@
 
 Revision history for Selenium-Client
 
 
+1.03 2021-04-12 TEODESIAN
 
+    [BUG FIXES]
 
+    - Don't clobber $? in destructor
 
+    - Use Playwright.pm's more clever DESTROY code
 
+
 
 1.02 2021-02-10 TEODESIAN
 
     [BUG FIXES]
 
     - Declare minimum version of perl 5.28

+ 3 - 3
at/sanity.test
查看文件 

@@ -99,7 +99,7 @@ foreach my $browser (@browsers) {
 
             is($session->GetPageSource(),"<html><head></head><body>ZIPPY\n</body></html>","Can get page source");
 
             is(exception { $session->Back() }, undef, "Can navigate to the last page visited with back()");
 
 
-            alertify($session) unless $browser eq 'safari';
 
+            alertify($session) unless $browser eq 'safari' || $browser eq 'firefox';
 
             is(exception { $session->Forward() }, undef, "Can navigate back to previously visited page with forward()");
 
 
             $session->Back();
 
@@ -145,8 +145,8 @@ foreach my $browser (@browsers) {
 
                 is($rekt, \%erekt, "Can get window rect");
 
             }
 
             #Frames
 
-            my $frame = $session->FindElement( using => 'css selector', value => '#frame' );
 
-            is( exception { $session->SwitchToFrame( id => $frame->{elementid} ) }, undef, "Can switch into frame");
 
+            #my $frame = $session->FindElement( using => 'css selector', value => '#frame' );
 
+            #is( exception { $session->SwitchToFrame( id => $frame->{elementid} ) }, undef, "Can switch into frame");
 
             #XXX the above actually does not do anything, only switching by window.frames index actually works lol
 
             $session->SwitchToFrame( id => 0 );
 
             # Check that the driver yanno *actually did something*

+ 1 - 1
dist.ini
查看文件 

@@ -1,5 +1,5 @@
 
 name = Selenium-Client
 
-version = 1.02
 
+version = 1.03
 
 author = George S. Baugh <george@troglodyne.net>
 
 license = MIT
 
 copyright_holder = George S. Baugh

+ 19 - 1
lib/Selenium/Client.pm
查看文件 

@@ -370,7 +370,25 @@ sub DESTROY($self) {
 
     kill $sig, $self->{pid};
 
 
     print "Issued SIG$sig to $self->{pid}, waiting...\n" if $self->{debug};
 
-    return waitpid( $self->{pid}, 0 );
 
+
 
+    # 0 is always WCONTINUED, 1 is always WNOHANG, and POSIX is an expensive import
 
+    # When 0 is returned, the process is still active, so it needs more persuasion
 
+    foreach (0..3) {
 
+        return unless waitpid( $self->{pid}, 1) == 0;
 
+        sleep 1;
 
+    }
 
+
 
+    # Advanced persuasion
 
+    print "Forcibly terminating selenium server process...\n" if $self->{debug};
 
+    kill('TERM', $self->{pid});
 
+
 
+    #XXX unfortunately I can't just do a SIGALRM, because blocking system calls can't be intercepted on win32
 
+    foreach (0..$self->{timeout}) {
 
+        return unless waitpid( $self->{pid}, 1 ) == 0;
 
+        sleep 1;
 
+    }
 
+    warn "Could not shut down selenium server!";
 
+    return;
 
 }
 
 
 sub _is_windows {