use jarsigner and keytool from same JDK as is being set in JAVA7_HOME

[fdroidserver.git] / tests / update.TestCase

diff --git a/tests/update.TestCase b/tests/update.TestCase
index 88b429fa92350c0cc8055c7c691119a43449bcae..07f5765428104daa6061c708352e0fc10b181fd9 100755 (executable)
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -4,21 +4,22 @@
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
 import inspect
+import logging
 import optparse
 import os
 import sys
 import unittest
 
-localmodule = os.path.realpath(os.path.join(
-        os.path.dirname(inspect.getfile(inspect.currentframe())),
-        '..'))
+localmodule = os.path.realpath(
+    os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
 print('localmodule: ' + localmodule)
 if localmodule not in sys.path:
-    sys.path.insert(0,localmodule)
+    sys.path.insert(0, localmodule)
 
 import fdroidserver.common
 import fdroidserver.update
-from fdroidserver.common import FDroidPopen, SilentPopen
+from fdroidserver.common import FDroidPopen
+
 
 class UpdateTest(unittest.TestCase):
     '''fdroid update'''
@@ -39,13 +40,17 @@ class UpdateTest(unittest.TestCase):
             return sig
         else:
             return None
-        
+
     def testGoodGetsig(self):
+        # config needed to use jarsigner and keytool
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
         apkfile = os.path.join(os.path.dirname(__file__), 'urzip.apk')
         sig = self.javagetsig(apkfile)
         self.assertIsNotNone(sig, "sig is None")
         pysig = fdroidserver.update.getsig(apkfile)
-        self.assertIsNotNone(pysig, "pysig is None")        
+        self.assertIsNotNone(pysig, "pysig is None")
         self.assertEquals(sig, fdroidserver.update.getsig(apkfile),
                           "python sig not equal to java sig!")
         self.assertEquals(len(sig), len(pysig),
@@ -58,6 +63,10 @@ class UpdateTest(unittest.TestCase):
             self.assertTrue(False, 'TypeError!')
 
     def testBadGetsig(self):
+        # config needed to use jarsigner and keytool
+        config = dict()
+        fdroidserver.common.fill_config_defaults(config)
+        fdroidserver.update.config = config
         apkfile = os.path.join(os.path.dirname(__file__), 'urzip-badsig.apk')
         sig = self.javagetsig(apkfile)
         self.assertIsNone(sig, "sig should be None: " + str(sig))