diff options
| author | Zachary Turner <zturner@google.com> | 2015-11-03 02:06:18 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-11-03 02:06:18 +0000 |
| commit | 95c453a221d5e757830145c2d5198c3a9da3f4b2 (patch) | |
| tree | aa824a74049518ed35ff67e2182f2dfcceac0658 /lldb/packages/Python/lldbsuite/test/lang/go | |
| parent | 6f4ed269b9f4d8296f2002f5d96fcc5d8a9ef7b1 (diff) | |
| download | bcm5719-llvm-95c453a221d5e757830145c2d5198c3a9da3f4b2.tar.gz bcm5719-llvm-95c453a221d5e757830145c2d5198c3a9da3f4b2.zip | |
Tighten up sys.path, and use absolute imports everywhere.
For convenience, we had added the folder that dotest.py was in
to sys.path, so that we could easily write things like
`import lldbutil` from anywhere and any test. This introduces
a subtle problem when using Python's package system, because when
unittest2 imports a particular test suite, the test suite is detached
from the package. Thus, writing "import lldbutil" from dotest imports
it as part of the package, and writing the same line from a test
does a fresh import since the importing module was not part of
the same package.
The real way to fix this is to use absolute imports everywhere. Instead
of writing "import lldbutil", we need to write "import
lldbsuite.test.util". This patch fixes up that and all other similar
cases, and additionally removes the script directory from sys.path
to ensure that this can't happen again.
llvm-svn: 251886
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lang/go')
3 files changed, 6 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py b/lldb/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py index 429665f120d..cbd244a7e05 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py +++ b/lldb/packages/Python/lldbsuite/test/lang/go/expressions/TestExpressions.py @@ -3,8 +3,8 @@ import os, time import unittest2 import lldb -import lldbutil -from lldbtest import * +import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.lldbtest import * class TestGoUserExpression(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py index 46d2e61ea88..cbad2557212 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py +++ b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -import lldbutil -from lldbtest import * +import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.lldbtest import * class TestGoASTContext(TestBase): diff --git a/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py index a9d9745b0d0..e57ef8868f6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py +++ b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py @@ -6,8 +6,8 @@ import use_lldb_suite import os, time import lldb -import lldbutil -from lldbtest import * +import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.lldbtest import * class TestGoASTContext(TestBase): |
