projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move 'launchpad' directory to 'RIFT_VAR_ROOT' from 'RIFT_ARTIFACTS'
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwlaunchpadtasklet
/
test
/
utest_uploader_app_dts.py
diff --git
a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
index
fdc2e22
..
d318e83
100755
(executable)
--- a/
rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
+++ b/
rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
@@
-33,6
+33,10
@@
import tornado.ioloop
import tornado.web
import tornado.httputil
import tornado.web
import tornado.httputil
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import gi
import requests
from tornado.platform.asyncio import AsyncIOMainLoop
import gi
import requests
from tornado.platform.asyncio import AsyncIOMainLoop
@@
-97,7
+101,7
@@
class TestCase(rift.test.dts.AbstractDTSTest):
def create_mock_package(self):
uid = str(uuid.uuid4())
path = os.path.join(
def create_mock_package(self):
uid = str(uuid.uuid4())
path = os.path.join(
- os.getenv('RIFT_
ARTIFACTS
'),
+ os.getenv('RIFT_
VAR_ROOT
'),
"launchpad/packages/vnfd",
uid)
"launchpad/packages/vnfd",
uid)
@@
-200,7
+204,7
@@
class TestCase(rift.test.dts.AbstractDTSTest):
data = data[-1]
assert type(data) is export.ExportSuccess
path = os.path.join(
data = data[-1]
assert type(data) is export.ExportSuccess
path = os.path.join(
- os.getenv("RIFT_
ARTIFACTS
"),
+ os.getenv("RIFT_
VAR_ROOT
"),
"launchpad/exports",
filename)
"launchpad/exports",
filename)