merge default -> production

--HG-- branch : production
mozilla · Apr 10, 2013 · 67f712a · 67f712a
2 parents 9d3c19c + 4bfcab1
commit 67f712a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/test/helper_files/.hgrc b/test/helper_files/.hgrc
@@ -6,10 +6,12 @@ share =
 convert =
 transplant =
 bookmarks =
-hggit =
 pager =
 purge =
 
+[format]
+dotencode = 0
+
 [ui]
 username = Client Builder <cltbld@mozilla.com>
 merge = internal:merge

diff --git a/test/test_base_script.py b/test/test_base_script.py
@@ -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

diff --git a/unit.sh b/unit.sh
@@ -83,6 +83,6 @@ if [ $OS_TYPE != 'windows' ] ; then
   fi
 else
   echo "### Running nosetests..."
-  nosetests
+  nosetests test/
 fi
 rm -rf build logs