--- a/buildframework/helium/sf/python/pythoncore/lib/pythoncorecpythontests/test_sis.py	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/python/pythoncore/lib/pythoncorecpythontests/test_sis.py	Fri Aug 13 14:59:05 2010 +0300
@@ -23,14 +23,12 @@
 import unittest
 import tempfile
 import os
-from lxml import etree
-
+import amara
 import configuration
 import sis
 
 _logger = logging.getLogger('test.sis')
 
-
 class ArchivePreBuilderTest(unittest.TestCase):
     """ Tests for sis module. """
     
@@ -39,20 +37,20 @@
         data = {'name': 'foo',
                 'path': 'bar'}
         tree = self._setup_test_case(data)
-        assert tree.xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
+        assert tree.xml_xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
         
     def test_sis_v2(self):
         """ V2 config format. """
         data = {'input': 'foo.pkg'}
         tree = self._setup_test_case(data)
-        assert tree.xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
+        assert tree.xml_xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
 
     def test_sis_v2_1(self):
         """ V2 config format for sisx. """
         data = {'input': 'foo.pkg', 'output': 'foo.sisx'}
         tree = self._setup_test_case(data)
-        assert tree.xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
-        assert tree.xpath("/project/target[@name='stage2']/parallel/*/arg/@line")[0] == '-v foo.sis foo.sisx cert1 key1'
+        assert tree.xml_xpath("/project/target[@name='stage1']/parallel/*/arg/@line")[0] == '-v foo.pkg foo.sis'
+        assert tree.xml_xpath("/project/target[@name='stage2']/parallel/*/arg/@line")[0] == '-v foo.sis foo.sisx cert1 key1'
         
     def _setup_test_case(self, additional_data):
         """ Setup test case based on varying inputs. """
@@ -66,7 +64,7 @@
         sis_prebuilder = sis.SisPreBuilder(config)
         tmpfile = os.path.join(tempfile.mkdtemp(), 'test.xml')
         sis_prebuilder.write(tmpfile)
-        tree = etree.parse(tmpfile)
+        tree = amara.parse(open(tmpfile))
         return tree