TRAFODION-1569 Release package has missing and incorrect files
Couple of additional fixes to remove obsolete names
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index 5c293c6..d7389fd 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -453,6 +453,7 @@
# End setup of PyODBC test
+source $HOME/.trafodion
cds
echo | tee -a ${MY_LOG_FILE}
diff --git a/dcs/src/test/pytests/.env.sh.tmpl b/dcs/src/test/pytests/.env.sh.tmpl
index 6e7ca18..5c5f2dd 100644
--- a/dcs/src/test/pytests/.env.sh.tmpl
+++ b/dcs/src/test/pytests/.env.sh.tmpl
@@ -27,7 +27,7 @@
export LANG=en_US.utf8
#--------------------------------------------------------------------
-# HPODBC enviroment variables
+# ODBC enviroment variables
#--------------------------------------------------------------------
export LD_LIBRARY_PATH=TEMPLATE_ODBC_LIB
export LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/dcs/src/test/pytests/.odbc.ini.tmpl b/dcs/src/test/pytests/.odbc.ini.tmpl
index 2783af0..559ac74 100644
--- a/dcs/src/test/pytests/.odbc.ini.tmpl
+++ b/dcs/src/test/pytests/.odbc.ini.tmpl
@@ -34,7 +34,6 @@
SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
SQL_QUERY_TIMEOUT = NO_TIMEOUT
-ServiceName = HP_DEFAULT_SERVICE
[TDM_Default_DataSource]
Description = Trafodion test system
@@ -47,5 +46,4 @@
SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
SQL_QUERY_TIMEOUT = NO_TIMEOUT
-ServiceName = HP_DEFAULT_SERVICE
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index 13a891c..54fea68 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -821,7 +821,7 @@
gvars.my_RUN_CMD = (os.path.join(ArgList._javahome, 'bin/java') + ' -cp ' + myclasspath +
' ' + myoptions + ' -Duser.timezone=GMT -Dtrafjdbc.properties=' +
ArgList._prop_file + ' org.junit.runner.JUnitCore ' +
- 'test.java.com.hp.phoenix.end2end.')
+ 'test.java.org.trafodion.phoenix.end2end.')
# Generate list of tests if needed
if ArgList._tests is None:
