Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fix package path and move files under doctor_tests"
[doctor.git]
/
doctor_tests
/
installer
/
apex.py
diff --git
a/tests/installer/apex.py
b/doctor_tests/installer/apex.py
similarity index 97%
rename from
tests/installer/apex.py
rename to
doctor_tests/installer/apex.py
index
98eb6c9
..
2a1ce94
100644
(file)
--- a/
tests/installer/apex.py
+++ b/
doctor_tests/installer/apex.py
@@
-12,10
+12,9
@@
import os
import pwd
import stat
import subprocess
import pwd
import stat
import subprocess
-import sys
-from common.utils import SSHClient
-from installer.base import BaseInstaller
+from
doctor_tests.
common.utils import SSHClient
+from
doctor_tests.
installer.base import BaseInstaller
class ApexInstaller(BaseInstaller):
class ApexInstaller(BaseInstaller):
@@
-59,7
+58,7
@@
class ApexInstaller(BaseInstaller):
gid = grp.getgrnam(user).gr_gid
os.chown('./instack_key', uid, gid)
os.chmod('./instack_key', stat.S_IREAD)
gid = grp.getgrnam(user).gr_gid
os.chown('./instack_key', uid, gid)
os.chmod('./instack_key', stat.S_IREAD)
- current_dir =
sys.path[0]
+ current_dir =
os.curdir
self.key_file = '{0}/{1}'.format(current_dir, 'instack_key')
return self.key_file
self.key_file = '{0}/{1}'.format(current_dir, 'instack_key')
return self.key_file