Mercurial > octave

changeset 24835:c644c53c8d37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use unique directory names in getpref and setpref tests * getpref.m, setpref.m: Use tempname to get unique directory names. Create directory for test and remove in unwind protect block.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Mar 2018 13:23:03 -0500
parents 6daf8a9bd1ed
children fd3edb183ee2
files scripts/prefs/getpref.m scripts/prefs/setpref.m
diffstat 2 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/prefs/getpref.m	Mon Mar 05 07:48:37 2018 +0100
+++ b/scripts/prefs/getpref.m	Mon Mar 05 13:23:03 2018 -0500
@@ -108,8 +108,11 @@
 
 %!test
 %! HOME = getenv ("HOME");
+%! tmp_home = tempname ();
 %! unwind_protect
-%!   setenv ("HOME", P_tmpdir ());
+%!   mkdir (tmp_home);
+%!   setenv ("HOME", tmp_home);
+%!
 %!   addpref ("group1", "pref1", [1 2 3]);
 %!   addpref ("group2", {"prefA", "prefB"}, {"StringA", {"StringB"}});
 %!
@@ -141,7 +144,10 @@
 %!         "preference prefD does not exist in GROUP group2");
 %!
 %! unwind_protect_cleanup
-%!   unlink (fullfile (P_tmpdir (), ".octave_prefs"));
+%!   unlink (fullfile (tmp_home, ".octave_prefs"));
+%!   if (exist (tmp_home, "dir"))
+%!     rmdir (tmp_home);
+%!   endif
 %!   if (isempty (HOME))
 %!     unsetenv ("HOME");
 %!   else
--- a/scripts/prefs/setpref.m	Mon Mar 05 07:48:37 2018 +0100
+++ b/scripts/prefs/setpref.m	Mon Mar 05 13:23:03 2018 -0500
@@ -71,8 +71,10 @@
 
 %!test
 %! HOME = getenv ("HOME");
+%! tmp_home = tempname ();
 %! unwind_protect
-%!   setenv ("HOME", P_tmpdir ());
+%!   mkdir (tmp_home);
+%!   setenv ("HOME", tmp_home);
 %!
 %!   setpref ("group1", "pref1", [1 2 3]);
 %!   assert (getpref ("group1", "pref1"), [1 2 3]);
@@ -88,7 +90,10 @@
 %!   fail ('setpref ("group1", {"p1", "p2"}, 1)', ...
 %!         "size mismatch for PREF and VAL");
 %! unwind_protect_cleanup
-%!   unlink (fullfile (P_tmpdir (), ".octave_prefs"));
+%!   unlink (fullfile (tmp_home, ".octave_prefs"));
+%!   if (exist (tmp_home, "dir"))
+%!     rmdir (tmp_home);
+%!   endif
 %!   if (isempty (HOME))
 %!     unsetenv ("HOME");
 %!   else