Permalink
Browse files

merge default -> production

--HG--
branch : production
  • Loading branch information...
2 parents 9d3c19c + 4bfcab1 commit 67f712a9371be40672e8073d23a9e66563d33b51 @escapewindow escapewindow committed Apr 10, 2013
Showing with 13 additions and 2 deletions.
  1. +3 −1 test/helper_files/.hgrc
  2. +9 −0 test/test_base_script.py
  3. +1 −1 unit.sh
@@ -6,10 +6,12 @@ share =
convert =
transplant =
bookmarks =
-hggit =
pager =
purge =
+[format]
+dotencode = 0
+
[ui]
username = Client Builder <cltbld@mozilla.com>
merge = internal:merge
@@ -45,6 +45,7 @@ def setUp(self):
self.s = None
def tearDown(self):
+ # Close the logfile handles, or windows can't remove the logs
if hasattr(self, 's') and isinstance(self.s, object):
del(self.s)
cleanup()
@@ -147,6 +148,7 @@ def setUp(self):
self.s = None
def tearDown(self):
+ # Close the logfile handles, or windows can't remove the logs
if hasattr(self, 's') and isinstance(self.s, object):
del(self.s)
cleanup()
@@ -288,6 +290,7 @@ def setUp(self):
self.s = None
def tearDown(self):
+ # Close the logfile handles, or windows can't remove the logs
if hasattr(self, 's') and isinstance(self.s, object):
del(self.s)
cleanup()
@@ -392,6 +395,12 @@ def setUp(self):
self.ATTEMPT_N = 1
self.s = script.BaseScript(initial_config_file='test/test.json')
+ def tearDown(self):
+ # Close the logfile handles, or windows can't remove the logs
+ if hasattr(self, 's') and isinstance(self.s, object):
+ del(self.s)
+ cleanup()
+
def _succeedOnSecondAttempt(self, foo=None, exception=Exception):
if self.ATTEMPT_N == 2:
self.ATTEMPT_N += 1
View
@@ -83,6 +83,6 @@ if [ $OS_TYPE != 'windows' ] ; then
fi
else
echo "### Running nosetests..."
- nosetests
+ nosetests test/
fi
rm -rf build logs

0 comments on commit 67f712a

Please sign in to comment.