543825 - use of __import__ needs to be removed from automation.py

Status: RESOLVED FIXED

(Testing :: General, defect)

Description

[Joel Maher ( :jmaher ) (UTC -8)]

Attachment: WIP patch, testing now

remove the use of __import__ from automation.py and move the calls out of the class.

Comment 1

[Joel Maher ( :jmaher ) (UTC -8)]

Attachment: remove use of __import__

remove the use of __import__ from automation.py

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 425061 [details] [diff] [review]
remove use of __import__ 

>diff --git a/build/automation.py.in b/build/automation.py.in
>--- a/build/automation.py.in
>+++ b/build/automation.py.in
>@@ -46,16 +46,20 @@ import re
> import select
> import shutil
> import signal
> import subprocess
> import sys
> import threading
> import tempfile
> 
>+SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
>+sys.path.insert(0, SCRIPT_DIR)
>+import automationutils
>+

I think I'd prefer __file__ to sys.argv[0], if that still works. (__file__ will be automation.py instead of runtests.py or whatever argv[0] is.)

Looks fine otherwise.

Comment 3

[Joel Maher ( :jmaher ) (UTC -8)]

Attachment: remove use of __import__ (1.2)

updated for bitrot, this passes on try server.

Comment 4

[cmtalbert]

Landed as changeset d24c14dfea78

Comment 5

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 432811 [details] [diff] [review]
remove use of __import__ (1.2)

>-      self.ctypes.windll.kernel32.GetExitCodeProcess(pHandle, self.ctypes.byref(pExitCode))
>-      self.ctypes.windll.kernel32.CloseHandle(pHandle)
>+      ctypes.windll.kernel32.GetExitCodeProcess(pHandle, self.ctypes.byref(pExitCode))

Did you miss a self.ctypes here?

Comment 6

[Joel Maher ( :jmaher ) (UTC -8)]

it does appear so, good catch.

Comment 7

[Jesse Ruderman]

That got filed as bug 574912 and fixed there.