[Mobies-commit] [commit] r4236 - in UDM/trunk/tests: . test_UdmPython

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Sat Jan 11 23:27:07 2014
New Revision: 4236

Log:
test_UdmPython now is OK on MAC OS X and  included in make test.

Modified:
   UDM/trunk/tests/Makefile.OSX
   UDM/trunk/tests/test_UdmPython/udm_python_test.py

Modified: UDM/trunk/tests/Makefile.OSX
==============================================================================
--- UDM/trunk/tests/Makefile.OSX	Sat Jan 11 23:27:03 2014	(r4235)
+++ UDM/trunk/tests/Makefile.OSX	Sat Jan 11 23:27:07 2014	(r4236)
@@ -1,5 +1,4 @@
-#SUBDIRS =test_UdmPython 
-SUBDIRS =test_generic test_generic2 test_libs test_simpleudmops testGetAdjacentObjects testOCL test_childrenorder testUdmCint test_cintstring  test_crosslinks test_ns test_ns2 test_refports test_domstringdn
+SUBDIRS =test_generic test_generic2 test_libs test_simpleudmops testGetAdjacentObjects testOCL test_childrenorder testUdmCint test_cintstring  test_crosslinks test_ns test_ns2 test_refports test_domstringdn test_UdmPython
 
 
 all:

Modified: UDM/trunk/tests/test_UdmPython/udm_python_test.py
==============================================================================
--- UDM/trunk/tests/test_UdmPython/udm_python_test.py	Sat Jan 11 23:27:03 2014	(r4235)
+++ UDM/trunk/tests/test_UdmPython/udm_python_test.py	Sat Jan 11 23:27:07 2014	(r4236)
@@ -12,6 +12,7 @@
 		
 		sys.path.append(os.path.join(os.path.dirname(__file__), "../../bin/"))
 
+
 elif _platform == "darwin":
 	#darwin
 	if os.environ.has_key("UDM_PATH"):
@@ -45,7 +46,10 @@
         test_meta = udm.map_uml_names(test_meta_dn.root)
 
         dn = udm.SmartDataNetwork(test_meta_dn.root)
-        dn.open(r"UdmPythonTestModel.mga", "")
+	if _platform == "linux" or _platform == "linux2" or _platform == "darwin":
+        	dn.open(r"UdmPythonTest.xml", "")
+	else:
+        	dn.open(r"UdmPythonTestModel.mga", "")
 
         container = dn.root.children()[0]
         self.assertTrue(container)