Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
cd373315
Commit
cd373315
authored
May 28, 2012
by
Mukund Sivaraman
Browse files
[1704] Use @abs_top_builddir@ directly in the .py.in file instead of using an env variable
parent
277be10c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/bind10/tests/Makefile.am
View file @
cd373315
...
...
@@ -23,7 +23,6 @@ endif
chmod +x $(abs_builddir)/$$pytest ;
\
$(LIBRARY_PATH_PLACEHOLDER)
\
PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10:$(abs_top_builddir)/src/lib/util/io/.libs
\
LOCKFILE_TESTPATH=$(abs_top_builddir)/src/bin/bind10/tests/lockfile_test
\
BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket
\
$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ;
\
done
src/bin/bind10/tests/bind10_test.py.in
View file @
cd373315
...
...
@@ -1465,13 +1465,14 @@ class SocketSrvTest(unittest.TestCase):
class TestFunctions(unittest.TestCase):
def setUp(self):
if not os.path.isdir(os.environ["LOCKFILE_TESTPATH"]):
os.mkdir(os.environ["LOCKFILE_TESTPATH"])
self.assertTrue(os.path.isdir(os.environ["LOCKFILE_TESTPATH"]))
self.lockfile_testpath = "@abs_top_builddir@/src/bin/bind10/tests/lockfile_test"
if not os.path.isdir(self.lockfile_testpath):
os.mkdir(self.lockfile_testpath)
self.assertTrue(os.path.isdir(self.lockfile_testpath))
def tearDown(self):
os.rmdir(
os.environ["LOCKFILE_TESTPATH"]
)
self.assertFalse(os.path.isdir(
os.environ["LOCKFILE_TESTPATH"]
))
os.rmdir(
self.lockfile_testpath
)
self.assertFalse(os.path.isdir(
self.lockfile_testpath
))
def test_remove_lock_files(self):
if "B10_FROM_BUILD" in os.environ:
...
...
@@ -1479,7 +1480,7 @@ class TestFunctions(unittest.TestCase):
else:
oldenv = None
os.environ["B10_FROM_BUILD"] =
os.environ["LOCKFILE_TESTPATH"]
os.environ["B10_FROM_BUILD"] =
self.lockfile_testpath
# create lockfiles for the testcase
lockfiles = ["logger_lockfile"]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment