Good evening!

Could I please get a very quick code review for

http://monaco.us.oracle.com/detail.jsf?cr=7104922

js2ai sysidcfg slim_unit test failure even after 7092599 and 7102957 is putback

It's only a 1 line change (and 1 whitespace line), so here's the fix:

[mox:test] > hg pdiffs
diff -r 9c79e2ac9ad9 usr/src/cmd/distro_const/checkpoints/test/test_pre_pkg_img_mod.py --- a/usr/src/cmd/distro_const/checkpoints/test/test_pre_pkg_img_mod.py Tue Oct 25 12:33:12 2011 -0600 +++ b/usr/src/cmd/distro_const/checkpoints/test/test_pre_pkg_img_mod.py Tue Oct 25 20:20:04 2011 -0600
@@ -454,3 +454,5 @@
         # verify that /refresh exists in the pkg_image dir
         self.assert_(os.path.isfile(os.path.join(self.ppim.pkg_img_path,
                                                  "refresh")))
+
+        del os.environ["SVCCFG_REPOSITORY"]

The problem here is that when I changed the DC checkpoint for pre_pkg_img_mod to deal with SMF environment variables, I moved those SMF variables to a per-process scope rather than setting the variables in the "global" scope (and then unsetting them later).

The test_generate_gnome_caches() unittest sets SVCCFG_REPOSITORY to a file in a temporary test directory but wasn't unsetting it at the end of the test. This wasn't an issue before because we were setting SVCCFG_REPOSITORY globally and unsetting it later. With the new behavior from 7092599, we picked up that environment variable in later tests, causing all kinds of havoc.

I've confirmed that the environment variable is unset and that no new errors are logged to the console. No new regressions were found.

Thanks!

-Drew
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss

Reply via email to