run-tests: set a default largefiles usercache in the default hgrc file
authorMatt Harbison <matt_harbison@yahoo.com>
Wed, 19 Nov 2014 23:41:40 -0500
changeset 23388 42ed0780ec4b
parent 23387 3eb99f8e9a62
child 23389 ce209c9d0aad
run-tests: set a default largefiles usercache in the default hgrc file This fixes a test failure introduced in 4be754832829 on Windows and OS X, where the cached largefile wasn't being deleted because the named .cache directory didn't exist. It only existed on Linux because the test suite sets $HOME to the directory of the test being run, and Linux uses $HOME/.cache by default. Most of the other largefiles tests explicitly set this value at the top of their scripts, but test-largefiles-update.t didn't pick that up when it was created. Those scripts that do set a value will override this. We could just set the parameter in the test-largefiles-update.t script, but there are a few other non obvious tests that exercise largefiles too. These largefiles end up being cached in the user's real cache, so proper hygiene dictates that this not be left to each individual test script.
tests/run-tests.py
tests/test-basic.t
tests/test-commandserver.t
--- a/tests/run-tests.py	Mon Nov 24 09:50:27 2014 -0800
+++ b/tests/run-tests.py	Wed Nov 19 23:41:40 2014 -0500
@@ -689,6 +689,10 @@
         hgrc.write('commit = -d "0 0"\n')
         hgrc.write('shelve = --date "0 0"\n')
         hgrc.write('tag = -d "0 0"\n')
+        hgrc.write('[largefiles]\n')
+        hgrc.write('usercache = %s\n' %
+                   (os.path.join(self._testtmp, '.cache/largefiles')))
+
         for opt in self._extraconfigopts:
             section, key = opt.split('.', 1)
             assert '=' in key, ('extra config opt %s must '
--- a/tests/test-basic.t	Mon Nov 24 09:50:27 2014 -0800
+++ b/tests/test-basic.t	Wed Nov 19 23:41:40 2014 -0500
@@ -5,6 +5,7 @@
   defaults.commit=-d "0 0"
   defaults.shelve=--date "0 0"
   defaults.tag=-d "0 0"
+  largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
   ui.slash=True
   ui.interactive=False
   ui.mergemarkers=detailed
--- a/tests/test-commandserver.t	Mon Nov 24 09:50:27 2014 -0800
+++ b/tests/test-commandserver.t	Wed Nov 19 23:41:40 2014 -0500
@@ -178,6 +178,7 @@
   defaults.commit=-d "0 0"
   defaults.shelve=--date "0 0"
   defaults.tag=-d "0 0"
+  largefiles.usercache=$TESTTMP/.cache/largefiles
   ui.slash=True
   ui.interactive=False
   ui.mergemarkers=detailed