--- a/src/tests/cli/t_pkg_temp_sources.py Fri May 06 17:24:48 2011 -0700
+++ b/src/tests/cli/t_pkg_temp_sources.py Sat May 07 00:25:10 2011 -0700
@@ -48,6 +48,7 @@
foo_pkg = """
open pkg://test/[email protected]
add set name=pkg.summary value="Example package foo."
+ add set name=variant.debug.foo value=true value=false
add dir mode=0755 owner=root group=bin path=lib
add dir mode=0755 owner=root group=bin path=usr
add dir mode=0755 owner=root group=bin path=usr/bin
@@ -122,7 +123,7 @@
def image_create(self, *args, **kwargs):
pkg5unittest.ManyDepotTestCase.image_create(self,
*args, **kwargs)
- self.ta_dir = os.path.join(self.img_path, "etc/certs/CA")
+ self.ta_dir = os.path.join(self.img_path(), "etc/certs/CA")
os.makedirs(self.ta_dir)
def __publish_packages(self, rurl):
@@ -613,6 +614,7 @@
expected = """\
set name=pkg.fmri value=%s
set name=pkg.summary value="Example package foo."
+set name=variant.debug.foo value=true value=false
dir group=bin mode=0755 owner=root path=lib
dir group=bin mode=0755 owner=root path=usr
dir group=bin mode=0755 owner=root path=usr/bin
@@ -795,7 +797,8 @@
#
# Verify change-facet can use temporary origins.
#
- fpath = os.path.join(self.img_path, "usr/share/man/man1/foo.1")
+ fpath = os.path.join(self.img_path(),
+ "usr/share/man/man1/foo.1")
assert os.path.exists(fpath)
# Now set facet.doc.man to false and verify faceted item is
@@ -824,7 +827,8 @@
#
# Verify change-variant can use temporary origins.
#
- vpath = os.path.join(self.img_path, "lib/libfoo.so.1")
+ vpath = os.path.join(self.img_path(),
+ "lib/libfoo.so.1")
assert os.path.exists(vpath)
self.assertEqual(os.stat(vpath).st_size, 15)